From 91978706279a19a3ac96393630876f3e50cbc518 Mon Sep 17 00:00:00 2001 From: Nippy Date: Fri, 9 Oct 2026 10:49:26 +0200 Subject: fix --- .../etc/calamares/modules/shellprocess-loader.conf | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf') diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf index 62fd87d..a65c6ef 100644 --- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf +++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf @@ -1,29 +1,17 @@ dontChroot: true timeout: 60 script: - # 1. Copy across RaveOS bootloader, loader.conf, remove the other entry - command: "cp -r /root/.loader.conf ${ROOT}/boot/loader/loader.conf || true" - command: "rm -r ${ROOT}/boot/loader/entries/*cachyos* || true" - # 2. Safety net: 95-raveos.install can silently produce a loader entry - # with no root= (findmnt returns empty depending on chroot context - # at kernel-install-hook time during pacstrap). Patch it here from - # the by-now-correct /etc/fstab. - command: "install -Dm755 /etc/calamares/modules/calamares-fix-bootentry.sh ${ROOT}/root/calamares-fix-bootentry.sh" - command: "arch-chroot ${ROOT} /bin/bash /root/calamares-fix-bootentry.sh" - command: "-rm ${ROOT}/root/calamares-fix-bootentry.sh" - # 3. Calamares' btrfsSubvolumes config is silently ignored -- it always - # creates its own hardcoded set (@, @home, @root, @srv, @cache, @log, - # @tmp). Drop the ones we don't want (@root, @srv, @tmp) and narrow - # @cache down to just /var/cache/pacman/pkg as @pkg. - command: "install -Dm755 /etc/calamares/modules/calamares-normalize-subvolumes.sh ${ROOT}/root/calamares-normalize-subvolumes.sh" - command: "arch-chroot ${ROOT} /bin/bash /root/calamares-normalize-subvolumes.sh" - command: "-rm ${ROOT}/root/calamares-normalize-subvolumes.sh" - # 4. Calamares' hardcoded btrfs subvolume layout has no .snapshots -- - # create it by hand (needed by grub-btrfs/Snapper). - command: "install -Dm755 /etc/calamares/modules/calamares-create-snapshots-subvol.sh ${ROOT}/root/calamares-create-snapshots-subvol.sh" - command: "arch-chroot ${ROOT} /bin/bash /root/calamares-create-snapshots-subvol.sh" - command: "-rm ${ROOT}/root/calamares-create-snapshots-subvol.sh" - # - command: "install -Dm755 /etc/calamares/modules/calamares-microcode-fix.sh ${ROOT}/root/calamares-microcode-fix.sh" -- cgit v1.3