Move speaker reboot bookkeeping into the migration
Keep hardware setup limited to installing the firmware package. The migration owns the pending-reboot marker and preserves prompts for every user migrating before reboot.
This commit is contained in:
1 parent
0d8232b9db
commit
499f50ffd6
3 files changed
+7
-6
No files matched your search
@@ -1,7 +1,3 @@
|
||||
if omarchy-hw-dell-xps13-dx13260-ptl; then
|
||||
if omarchy-pkg-missing linux-firmware-cirrus-dx13260; then
|
||||
firmware_pending="/run/omarchy/xps13-ptl-speaker-firmware"
|
||||
sudo install -Dm644 /dev/null "$firmware_pending"
|
||||
fi
|
||||
omarchy-pkg-add linux-firmware-cirrus-dx13260
|
||||
fi
|
||||
@@ -1,10 +1,14 @@
|
||||
echo "Install the Dell XPS 13 Panther Lake speaker firmware"
|
||||
|
||||
if omarchy-hw-dell-xps13-dx13260-ptl; then
|
||||
firmware_pending="/run/omarchy/xps13-ptl-speaker-firmware"
|
||||
if omarchy-pkg-missing linux-firmware-cirrus-dx13260; then
|
||||
sudo install -Dm644 /dev/null "$firmware_pending"
|
||||
fi
|
||||
|
||||
source "$OMARCHY_PATH/install/hardware/dell-xps13-ptl-speaker-firmware.sh"
|
||||
|
||||
# The marker lasts until reboot so every user migrating beforehand is prompted.
|
||||
firmware_pending="/run/omarchy/xps13-ptl-speaker-firmware"
|
||||
if [[ -e $firmware_pending ]]; then
|
||||
omarchy-state set reboot-required
|
||||
fi
|
||||
|
||||
@@ -98,9 +98,10 @@ for version in "" "20260810-2" "20260810-3" "20260810-4" "20260910-2" "20260916-
|
||||
run_leaf || fail "the alias package is installed during hardware setup"
|
||||
[[ $(<"$TEST_LOG") == "$install_call" && $(<"$TEST_VERSION_FILE") == "$version" && -e $TEST_ALIAS_FILE ]] ||
|
||||
fail "hardware setup installs the separate aliases without replacing stock firmware"
|
||||
[[ -e $firmware_pending ]] || fail "the firmware repair records its pending reboot"
|
||||
[[ ! -e $firmware_pending ]] || fail "hardware setup leaves reboot bookkeeping to the migration"
|
||||
done
|
||||
pass "hardware setup installs the package identity without replacing any stock firmware"
|
||||
pass "hardware setup leaves reboot bookkeeping to the migration"
|
||||
|
||||
reset_fixture "20260810-2"
|
||||
touch "$TEST_ALIAS_FILE"
|
||||
|
||||
Reference in new issue
Block a user