Changed contextual processes and shell processes as needed to support new `ROOT` placeholder syntax in Calamares 3.3.0.

ubuntu/kinetic
Aaron Rainbolt 3 years ago committed by Simon Quigley
parent 9efa3a5d54
commit 332dcf71a4

@ -6,4 +6,4 @@
dontChroot: false dontChroot: false
timeout: 120 timeout: 120
firmwareType: firmwareType:
"*": "-for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/lubuntu-calamares.desktop || exit 0; done" "*": "-for i in $(ls `ROOT`/home/); do rm `ROOT`/home/$i/Desktop/lubuntu-calamares.desktop || exit 0; done"

@ -3,8 +3,8 @@ dontChroot: true
timeout: 10 timeout: 10
firmwareType: firmwareType:
efi: efi:
- -cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r) - -cp /cdrom/casper/vmlinuz `ROOT`/boot/vmlinuz-$(uname -r)
- -mkdir -pv @@ROOT@@/media/cdrom - -mkdir -pv `ROOT`/media/cdrom
- -mount --bind /cdrom @@ROOT@@/media/cdrom - -mount --bind /cdrom `ROOT`/media/cdrom
bios: bios:
- -cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r) - -cp /cdrom/casper/vmlinuz `ROOT`/boot/vmlinuz-$(uname -r)

@ -2,4 +2,4 @@
dontChroot: false dontChroot: false
timeout: 30 timeout: 30
script: script:
- "touch @@ROOT@@/boot/initrd.img-$(uname -r)" - "touch `ROOT`/boot/initrd.img-$(uname -r)"

@ -2,4 +2,4 @@
dontChroot: true dontChroot: true
timeout: 30 timeout: 30
script: script:
- calamares-logs-helper @@ROOT@@ - calamares-logs-helper `ROOT`

Loading…
Cancel
Save