From b8c17dc3488e51710c5a51b99e7aae3d432e0d25 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Mon, 13 Jan 2025 12:18:35 +0500 Subject: [PATCH] Update --- src/modules/finished/finished.conf | 47 ++++++++++++++++++++++++++++ src/modules/finishedq/finishedq.conf | 36 +++++++++++++++++++++ src/modules/finishedq/seedling.svg | 1 + src/modules/unpackfsc/unpackfsc.conf | 6 ++-- 4 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 src/modules/finished/finished.conf create mode 100644 src/modules/finishedq/finishedq.conf create mode 100644 src/modules/finishedq/seedling.svg diff --git a/src/modules/finished/finished.conf b/src/modules/finished/finished.conf new file mode 100644 index 0000000..b0647fe --- /dev/null +++ b/src/modules/finished/finished.conf @@ -0,0 +1,47 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration for the "finished" page, which is usually shown only at +# the end of the installation (successful or not). +--- +# DEPRECATED +# +# The finished page can hold a "restart system now" checkbox. +# If this is false, no checkbox is shown and the system is not restarted +# when Calamares exits. +# restartNowEnabled: true + +# DEPRECATED +# +# Initial state of the checkbox "restart now". Only relevant when the +# checkbox is shown by restartNowEnabled. +# restartNowChecked: false + +# Behavior of the "restart system now" button. +# +# There are four usable values: +# - never +# Does not show the button and does not restart. +# This matches the old behavior with restartNowEnabled=false. +# - user-unchecked +# Shows the button, defaults to unchecked, restarts if it is checked. +# This matches the old behavior with restartNowEnabled=true and restartNowChecked=false. +# - user-checked +# Shows the button, defaults to checked, restarts if it is checked. +# This matches the old behavior with restartNowEnabled=true and restartNowChecked=true. +# - always +# Shows the button, checked, but the user cannot change it. +# This is new behavior. +# +# The three combinations of legacy values are still supported. +restartNowMode: user-checked + +# If the checkbox is shown, and the checkbox is checked, then when +# Calamares exits from the finished-page it will run this command. +# If not set, falls back to "shutdown -r now". +restartNowCommand: "systemctl -i reboot" + +# When the last page is (successfully) reached, send a DBus notification +# to the desktop that the installation is done. This works only if the +# user as whom Calamares is run, can reach the regular desktop session bus. +notifyOnFinished: false diff --git a/src/modules/finishedq/finishedq.conf b/src/modules/finishedq/finishedq.conf new file mode 100644 index 0000000..6b3746b --- /dev/null +++ b/src/modules/finishedq/finishedq.conf @@ -0,0 +1,36 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration for the "finishedq" page, which is usually shown only at +# the end of the installation (successful or not). +# +# See the documentation for the "finished" module for a full explanation +# of the configuration options; the description here applies primarily +# to the use that the QML makes of them. +--- +# Behavior of the "restart system now" button. +# +# The example QML for this module offers a "Restart Now" button, +# which the user can click on. It calls directly to the restart +# function. If the user closes the installer in some other way, +# (the "Done" button or close-window) a restart **might** happen: +# +# - never +# Do not restart (this will also block the "Restart Now" button, +# so it is not very useful) +# - user-unchecked +# Do not restart on other ways of closing the window. No checkbox +# is shown in the example QML, so there is no way for the user to +# express a choice -- except by clicking the "Restart Now" button. +# - user-checked +# Do restart on other ways of closing the window. This makes close +# and "Restart Now" do the same thing. No checkbox is shown by the QML, +# so the machine will **always** restart. +# - always +# Same as above. +# +# For the **specific** example QML included with this module, only +# *user-unchecked* really makes sense. +restartNowMode: user-checked +restartNowCommand: "systemctl -i reboot" +notifyOnFinished: false diff --git a/src/modules/finishedq/seedling.svg b/src/modules/finishedq/seedling.svg new file mode 100644 index 0000000..8f3501b --- /dev/null +++ b/src/modules/finishedq/seedling.svg @@ -0,0 +1 @@ + diff --git a/src/modules/unpackfsc/unpackfsc.conf b/src/modules/unpackfsc/unpackfsc.conf index 8780862..ef6835c 100644 --- a/src/modules/unpackfsc/unpackfsc.conf +++ b/src/modules/unpackfsc/unpackfsc.conf @@ -51,7 +51,7 @@ sourcefs: "squashfs" destination: "" # condition: true -source: "/run/archiso/bootmnt/arch/boot/x86_64/vmlinuz-linux-cachyos" -sourcefs: "file" -destination: "/boot/vmlinuz-linux-cachyos" +# source: "/run/archiso/bootmnt/arch/boot/x86_64/vmlinuz-linux-cachyos" +# sourcefs: "file" +# destination: "/boot/vmlinuz-linux-cachyos" # condition: true