Emir Beganovic
452835da8b
The migration read ESP_PATH from /etc/default/limine at its top. On a machine without that file sed fails, and under bash -euo pipefail the migration stopped there with an error, before the check that lets a machine without Limine skip it. The read moves to after the rebuild, the one place the path is used; a path given for the tests is taken first, and a missing file means /boot.
55 lines
2.6 KiB
Bash
55 lines
2.6 KiB
Bash
echo "Stop the boot from waiting on a black screen for the console to answer"
|
|
|
|
# systemd asks the console for its size when PID 1 starts and waits for the
|
|
# reply. With Plymouth holding the screen the reply sometimes never comes, and
|
|
# about 1 boot in 10 sits on a black screen until a key is pressed.
|
|
# omarchy-defaults.conf now carries systemd.tty.term.console=dumb, which makes
|
|
# systemd skip the query. The package has already written that file by the
|
|
# time this runs; the boot image still holds the old command line until it is
|
|
# rebuilt.
|
|
|
|
defaults_conf="${OMARCHY_LIMINE_DEFAULTS_CONF:-/etc/limine-entry-tool.d/omarchy-defaults.conf}"
|
|
running_cmdline="${OMARCHY_RUNNING_CMDLINE:-/proc/cmdline}"
|
|
rebuild_marker="${OMARCHY_LIMINE_REBUILD_MARKER:-/var/lib/omarchy/migrations/1791581004}"
|
|
param="systemd.tty.term.console=dumb"
|
|
|
|
omarchy-cmd-present limine-mkinitcpio || exit 0
|
|
[[ -f $defaults_conf && -r $running_cmdline ]] || exit 0
|
|
|
|
# The running kernel keeps its old command line until reboot, so a marker
|
|
# records the machine-wide rebuild: another user's migration must not repeat
|
|
# it before then, while a missing marker still retries an interrupted rebuild.
|
|
[[ ! -e $rebuild_marker ]] || exit 0
|
|
|
|
# A machine that boots with it already, or whose defaults were edited to leave
|
|
# it out, has nothing to rebuild.
|
|
[[ " $(<"$running_cmdline") " != *" $param "* ]] || exit 0
|
|
grep -Eq "^KERNEL_CMDLINE\[default\]\+=\".*${param//./\\.}.*\"" "$defaults_conf" || exit 0
|
|
|
|
echo "The booted kernel is missing $param; rebuilding the boot image"
|
|
sudo limine-mkinitcpio
|
|
|
|
# The boot menu is on the ESP, which /etc/default/limine names; /boot when it
|
|
# does not, or is not there.
|
|
limine_conf="${OMARCHY_LIMINE_CONF:-}"
|
|
if [[ -z $limine_conf ]]; then
|
|
esp=""
|
|
if [[ -r /etc/default/limine ]]; then
|
|
esp=$(sed -n 's/^ESP_PATH=["'\'']\?\([^"'\'']*\).*/\1/p' /etc/default/limine | tail -n 1)
|
|
fi
|
|
limine_conf="${esp:-/boot}/limine.conf"
|
|
fi
|
|
|
|
# limine-mkinitcpio carries on past a kernel it could not build, a full boot
|
|
# partition for one, and still exits 0. Done means a boot entry has the
|
|
# parameter: without that the migration stays pending and the next update
|
|
# tries again. A menu with no command lines in it (they are inside the boot
|
|
# images then) has nothing to look at, and is taken at its word.
|
|
if sudo grep -Eq '^[[:space:]]*cmdline:' "$limine_conf" 2>/dev/null &&
|
|
! sudo grep -Eq "^[[:space:]]*cmdline:.*[[:space:]]${param//./\\.}([[:space:]]|\$)" "$limine_conf"; then
|
|
echo "The boot menu still has no entry with $param after the rebuild" >&2
|
|
exit 1
|
|
fi
|
|
|
|
sudo install -Dm644 /dev/null "$rebuild_marker"
|