diff --git a/lubuntu/modules/after_bootloader_context.conf b/lubuntu/modules/after_bootloader_context.conf index e40d02d..7d1620b 100644 --- a/lubuntu/modules/after_bootloader_context.conf +++ b/lubuntu/modules/after_bootloader_context.conf @@ -1,9 +1,5 @@ -# Workaround from ubiquity. Ubuntu's grub will want to look in EFI/ubuntu, so -# let's make sure it can find something there. -# This only copies the cfg and doesn't overwrite, this is specifically so -# this doesn't interfere with an Ubuntu installed on the system already. --- dontChroot: false timeout: 120 firmwareType: - "*": "-for i in $(ls `ROOT`/home/); do rm `ROOT`/home/$i/Desktop/lubuntu-calamares.desktop || exit 0; done" + "*": "-rm ${ROOT}/home/${USER}/Desktop/lubuntu-calamares.desktop" diff --git a/lubuntu/modules/before_bootloader_mkdirs_context.conf b/lubuntu/modules/before_bootloader_mkdirs_context.conf index 5f488af..6aeb829 100644 --- a/lubuntu/modules/before_bootloader_mkdirs_context.conf +++ b/lubuntu/modules/before_bootloader_mkdirs_context.conf @@ -3,8 +3,8 @@ dontChroot: true timeout: 10 firmwareType: efi: - - -cp /cdrom/casper/vmlinuz `ROOT`/boot/vmlinuz-$(uname -r) - - -mkdir -pv `ROOT`/media/cdrom - - -mount --bind /cdrom `ROOT`/media/cdrom + - -cp /cdrom/casper/vmlinuz ${ROOT}/boot/vmlinuz-$(uname -r) + - -mkdir -pv ${ROOT}/media/cdrom + - -mount --bind /cdrom ${ROOT}/media/cdrom bios: - - -cp /cdrom/casper/vmlinuz `ROOT`/boot/vmlinuz-$(uname -r) + - -cp /cdrom/casper/vmlinuz ${ROOT}/boot/vmlinuz-$(uname -r) diff --git a/lubuntu/modules/shellprocess_bug-LP#1829805.conf b/lubuntu/modules/shellprocess_bug-LP#1829805.conf index 8d9bfae..6f68ff3 100644 --- a/lubuntu/modules/shellprocess_bug-LP#1829805.conf +++ b/lubuntu/modules/shellprocess_bug-LP#1829805.conf @@ -2,4 +2,4 @@ dontChroot: false timeout: 30 script: - - "touch `ROOT`/boot/initrd.img-$(uname -r)" + - "touch ${ROOT}/boot/initrd.img-$(uname -r)" diff --git a/lubuntu/modules/shellprocess_logs.conf b/lubuntu/modules/shellprocess_logs.conf index b3fd291..b0d5872 100644 --- a/lubuntu/modules/shellprocess_logs.conf +++ b/lubuntu/modules/shellprocess_logs.conf @@ -2,4 +2,4 @@ dontChroot: true timeout: 30 script: - - calamares-logs-helper `ROOT` + - calamares-logs-helper ${ROOT}