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.conf9
1 files changed, 8 insertions, 1 deletions
diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf
index 13b7dca..62fd87d 100644
--- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf
+++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-loader.conf
@@ -11,7 +11,14 @@ script:
- 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' hardcoded btrfs subvolume layout has no .snapshots --
+ # 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"