Merge branch 'master' into dev

This commit is contained in:
David Heinemeier Hansson
2025-11-07 21:54:13 +01:00
2 changed files with 17 additions and 0 deletions

View File

@@ -78,6 +78,11 @@ term_background_bright: 24283b
EOF EOF
# Remove the original config file if it's not /boot/limine.conf
if [[ "$limine_config" != "/boot/limine.conf" ]] && [[ -f "$limine_config" ]]; then
sudo rm "$limine_config"
fi
# Match Snapper configs if not installing from the ISO # Match Snapper configs if not installing from the ISO
if [[ -z ${OMARCHY_CHROOT_INSTALL:-} ]]; then if [[ -z ${OMARCHY_CHROOT_INSTALL:-} ]]; then

12
migrations/1762446739.sh Normal file
View File

@@ -0,0 +1,12 @@
echo "Remove alternative limine.conf files"
if omarchy-cmd-present limine; then
if [ ! -f /boot/limine.conf ]; then
echo "Error: /boot/limine.conf does not exist. Do not reboot without resolving this issue!"
exit 1
fi
sudo rm -f /boot/EFI/limine/limine.conf
sudo rm -f /boot/EFI/BOOT/limine.conf
sudo rm -f /boot/limine/limine.conf
fi