summaryrefslogtreecommitdiff
path: root/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf
diff options
context:
space:
mode:
Diffstat (limited to 'raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf')
-rw-r--r--raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf7
1 files changed, 7 insertions, 0 deletions
diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf
index 69d9f30..3b2fde0 100644
--- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf
+++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf
@@ -4,6 +4,13 @@ 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"
# - command: "install -Dm755 /etc/calamares/modules/calamares-microcode-fix.sh ${ROOT}/root/calamares-microcode-fix.sh"