summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2022-09-21 01:08:17 +0200
committerSilvan Mosberger <silvan.mosberger@tweag.io>2023-02-15 17:14:14 +0100
commitb8e8e8c720ce4a8efd3835b9e99bdde1eea77b07 (patch)
tree2000fe8e53208d3be701ea34e016f8ea57bf68c4
parentMerge pull request #216028 from r-ryantm/auto-update/darkman (diff)
downloadnixpkgs-origin/system.tar.gz
Resume from hibernate before postDeviceCommandsorigin/system
Should work for me, because I don't want to be asked for ZFS credentials when I can resume
-rw-r--r--nixos/modules/system/boot/stage-1-init.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index af57310bda7d..74d69318dc05 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -267,7 +267,6 @@ lvm vgchange -ay
if test -n "$debug1devices"; then fail; fi
-@postDeviceCommands@
# Check the specified file system, if appropriate.
@@ -484,6 +483,8 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then
fi
fi
+@postDeviceCommands@
+
# If we have a path to an iso file, find the iso and link it to /dev/root
if [ -n "$isoPath" ]; then
mkdir -p /findiso