arthur/arthur-os
1
0
Fork 0
mirror of https://github.com/arthur-pbty/arthur-os.git synced 2026-08-01 20:28:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct the order to prevent error message during install

Browse Source
This commit is contained in:
David Heinemeier Hansson
2026-04-30 20:04:54 +02:00
parent 91608ea3d3
commit a43df3963a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/login/limine-snapper.sh
+8 -3
View File
@@ -1,6 +1,4 @@
if command -v limine &>/dev/null; then if command -v limine &>/dev/null; then
sudo pacman -S --noconfirm --needed limine-snapper-sync limine-mkinitcpio-hook
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
@@ -29,6 +27,10 @@ EOF
CMDLINE=$(grep "^[[:space:]]*cmdline:" "$limine_config" | head -1 | sed 's/^[[:space:]]*cmdline:[[:space:]]*//') CMDLINE=$(grep "^[[:space:]]*cmdline:" "$limine_config" | head -1 | sed 's/^[[:space:]]*cmdline:[[:space:]]*//')
# Write /etc/default/limine *before* installing limine-mkinitcpio-hook, whose
# post-transaction deploy hook runs limine-install and reads this file. Without
# it, ESP_PATH falls back to bootctl, which in a chroot prints a warning that
# gets captured as the path and trips a spurious "invalid ESP" error.
sudo cp $OMARCHY_PATH/default/limine/default.conf /etc/default/limine sudo cp $OMARCHY_PATH/default/limine/default.conf /etc/default/limine
sudo sed -i "s|@@CMDLINE@@|$CMDLINE|g" /etc/default/limine sudo sed -i "s|@@CMDLINE@@|$CMDLINE|g" /etc/default/limine
@@ -42,7 +44,8 @@ EOF
sudo sed -i '/^ENABLE_UKI=/d; /^ENABLE_LIMINE_FALLBACK=/d' /etc/default/limine sudo sed -i '/^ENABLE_UKI=/d; /^ENABLE_LIMINE_FALLBACK=/d' /etc/default/limine
fi fi
# Remove the original config file if it's not /boot/limine.conf # Remove the original config file if it's not /boot/limine.conf, so the deploy
# hook doesn't see conflicting configs on the same ESP.
if [[ $limine_config != "/boot/limine.conf" ]] && [[ -f $limine_config ]]; then if [[ $limine_config != "/boot/limine.conf" ]] && [[ -f $limine_config ]]; then
sudo rm "$limine_config" sudo rm "$limine_config"
fi fi
@@ -50,6 +53,8 @@ EOF
# We overwrite the whole thing knowing the limine-update will add the entries for us # We overwrite the whole thing knowing the limine-update will add the entries for us
sudo cp $OMARCHY_PATH/default/limine/limine.conf /boot/limine.conf sudo cp $OMARCHY_PATH/default/limine/limine.conf /boot/limine.conf
sudo pacman -S --noconfirm --needed limine-snapper-sync limine-mkinitcpio-hook
# Only snapshot root — /home is user data; rolling it back loses user work # Only snapshot root — /home is user data; rolling it back loses user work
if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then
sudo snapper -c root create-config / sudo snapper -c root create-config /