Merge pull request #1020 from ryanrhughes/limine-fixes

Minor Limine / Snapper Tweaks and Fixes
This commit is contained in:
Ryan Hughes 2025-08-24 01:09:02 +02:00 committed by GitHub
commit 82467892a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,8 +1,6 @@
#!/bin/bash #!/bin/bash
if command -v limine &>/dev/null && [ ! -f /etc/default/limine ]; then if command -v limine &>/dev/null; then
yay -S --noconfirm --needed limine-mkinitcpio-hook limine-snapper-sync
sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf <<EOF >/dev/null sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf <<EOF >/dev/null
HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs) HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs)
EOF EOF
@ -17,6 +15,8 @@ EOF
sudo tee /etc/default/limine <<EOF >/dev/null sudo tee /etc/default/limine <<EOF >/dev/null
TARGET_OS_NAME="Omarchy" TARGET_OS_NAME="Omarchy"
ESP_PATH="/boot"
KERNEL_CMDLINE[default]="$CMDLINE" KERNEL_CMDLINE[default]="$CMDLINE"
KERNEL_CMDLINE[default]+="quiet splash" KERNEL_CMDLINE[default]+="quiet splash"
@ -62,6 +62,7 @@ term_background_bright: 24283b
EOF EOF
yay -S --noconfirm --needed limine-mkinitcpio-hook limine-snapper-sync
sudo limine-update sudo limine-update
# Match Snapper configs if not installing from the ISO # Match Snapper configs if not installing from the ISO
@ -84,8 +85,7 @@ EOF
fi fi
# Add UKI entry to UEFI machines to skip bootloader showing on normal boot # Add UKI entry to UEFI machines to skip bootloader showing on normal boot
# Only doing this for ISO installs if [ -n "$EFI" ] && efibootmgr &>/dev/null && ! efibootmgr | grep -q Omarchy; then
if [ -n "${OMARCHY_CHROOT_INSTALL:-}" ] && efibootmgr &>/dev/null && ! efibootmgr | grep -q Omarchy; then
sudo efibootmgr --create \ sudo efibootmgr --create \
--disk "$(findmnt -n -o SOURCE /boot | sed 's/[0-9]*$//')" \ --disk "$(findmnt -n -o SOURCE /boot | sed 's/[0-9]*$//')" \
--part "$(findmnt -n -o SOURCE /boot | grep -o '[0-9]*$')" \ --part "$(findmnt -n -o SOURCE /boot | grep -o '[0-9]*$')" \