diff --git a/community/ukui/live-overlay/etc/calamares/modules/shellprocess-ukuiflashdisk.conf b/community/ukui/live-overlay/etc/calamares/modules/shellprocess-ukuiflashdisk.conf deleted file mode 100644 index 18bf7eb3..00000000 --- a/community/ukui/live-overlay/etc/calamares/modules/shellprocess-ukuiflashdisk.conf +++ /dev/null @@ -1,34 +0,0 @@ -# Configuration for the shell process job. -# -# Executes a list of commands found under the key *script*. -# If the top-level key *dontChroot* is true, then the commands -# are executed in the context of the live system, otherwise -# in the context of the target system. In all of the commands, -# the following substitutions will take place: -# - `@@ROOT@@` is replaced by the root mount point of the **target** -# system from the point of view of the command (for chrooted -# commands, that will be */*). -# - `@@USER@@` is replaced by the username, set on the user page. -# -# The (global) timeout for the command list can be set with -# the *timeout* key. The value is a time in seconds, default -# is 10 seconds if not set. -# -# If a command starts with "-" (a single minus sign), then the -# return value of the command following the - is ignored; otherwise, -# a failing command will abort the installation. This is much like -# make's use of - in a command. -# -# The value of *script* may be: -# - a single string; this is one command that is executed. -# - a list of strings; these are executed one at a time, by -# separate shells (/bin/sh -c is invoked for each command). -# - an object, specifying a key *command* and (optionally) -# a key *timeout* to set the timeout for this specific -# command differently from the global setting. ---- -dontChroot: true -timeout: 10 -script: - - command : "pkill ukui-flash-disk" - diff --git a/community/ukui/live-overlay/etc/calamares/settings.conf b/community/ukui/live-overlay/etc/calamares/settings.conf deleted file mode 100644 index 3904772a..00000000 --- a/community/ukui/live-overlay/etc/calamares/settings.conf +++ /dev/null @@ -1,52 +0,0 @@ ---- -modules-search: [ local ] - -instances: -- id: ukuiflashdisk - module: shellprocess - config: shellprocess-ukuiflashdisk.conf - -sequence: -- show: - - welcome - - locale - - keyboard - - partition - - users - - summary -- exec: - - shellprocess@ukuiflashdisk - - partition - - mount - - unpackfs - - networkcfg - - machineid - - fstab - - locale - - keyboard - - localecfg - - luksopenswaphookcfg - - luksbootkeyfile - - initcpiocfg - - initcpio - - users - - displaymanager - - mhwdcfg - - hwclock - - services - - grubcfg - - bootloader - - postcfg - - umount -- show: - - finished - -branding: manjaro - -prompt-install: true - -dont-chroot: false -oem-setup: false -disable-cancel: false -disable-cancel-during-exec: true -quit-at-end: false diff --git a/community/ukui/live-overlay/etc/xdg/autostart/calamares-ukui-set.desktop b/community/ukui/live-overlay/etc/xdg/autostart/calamares-ukui-set.desktop new file mode 100644 index 00000000..ee5a2c35 --- /dev/null +++ b/community/ukui/live-overlay/etc/xdg/autostart/calamares-ukui-set.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Icon=system +Name=Calamares-ukui-set +Comment=Calamares tweak for install Ukui desktop +Exec=sh -c "sudo rm -f /usr/bin/ukui-flash-disk && sleep 2 && sudo pkill ukui-flash-disk" +Terminal=false +Type=Application +Categories=System +StartupNotify=false