From b8cc8d8bc30087becf751b033f083c14a77405eb Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sat, 23 Aug 2025 20:25:04 +0200 Subject: [PATCH 1/2] Move update up in case something goes wrong --- install/login/limine-snapper.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh index 94437ebd..af520688 100644 --- a/install/login/limine-snapper.sh +++ b/install/login/limine-snapper.sh @@ -52,6 +52,8 @@ term_background_bright: 24283b EOF + sudo limine-update + # Match Snapper configs if not installing from the ISO if [ -z "${OMARCHY_CHROOT_INSTALL:-}" ]; then if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then From 5873980703951bfd9367e1b4e2b8329d3da6a177 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sat, 23 Aug 2025 20:25:46 +0200 Subject: [PATCH 2/2] Add efi checks --- install/login/limine-snapper.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh index af520688..1317cf0d 100644 --- a/install/login/limine-snapper.sh +++ b/install/login/limine-snapper.sh @@ -7,7 +7,12 @@ if command -v limine &>/dev/null && [ ! -f /etc/default/limine ]; then HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs) EOF - CMDLINE=$(grep "^[[:space:]]*cmdline:" /boot/EFI/limine/limine.conf | head -1 | sed 's/^[[:space:]]*cmdline:[[:space:]]*//') + [[ -f /boot/EFI/limine/limine.conf ]] && EFI=true + + # Conf location is different between EFI and BIOS + [[ -n "$EFI" ]] && limine_config="/boot/EFI/limine/limine.conf" || limine_config="/boot/limine/limine.conf" + + CMDLINE=$(grep "^[[:space:]]*cmdline:" "$limine_config" | head -1 | sed 's/^[[:space:]]*cmdline:[[:space:]]*//') sudo tee /etc/default/limine </dev/null TARGET_OS_NAME="Omarchy" @@ -29,6 +34,11 @@ MAX_SNAPSHOT_ENTRIES=5 SNAPSHOT_FORMAT_CHOICE=5 EOF + # UKI and EFI fallback are EFI only + if [[ -z $EFI ]]; then + sudo sed -i '/^ENABLE_UKI=/d; /^ENABLE_LIMINE_FALLBACK=/d' /etc/default/limine + fi + # We overwrite the whole thing knowing the limine-update will add the entries for us sudo tee /boot/limine.conf </dev/null ### Read more at config document: https://github.com/limine-bootloader/limine/blob/trunk/CONFIG.md @@ -70,7 +80,6 @@ EOF sudo sed -i 's/^NUMBER_LIMIT="50"/NUMBER_LIMIT="5"/' /etc/snapper/configs/{root,home} sudo sed -i 's/^NUMBER_LIMIT_IMPORTANT="10"/NUMBER_LIMIT_IMPORTANT="5"/' /etc/snapper/configs/{root,home} - sudo limine-update chrootable_systemctl_enable limine-snapper-sync.service fi