diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:12:32 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:12:32 +0200 |
| commit | 958de05a638430c70cf51902367d0e7d504108e6 (patch) | |
| tree | 376e0cc8b84b2a9952e7f2764e9f4fd8d42a88d8 | |
| parent | 942e74bec8ba8d3de286f16a68dd73f22b78ce00 (diff) | |
| parent | 2a31397f536b3bf57e4ee76b812fd83ab31de971 (diff) | |
| download | nixlib-958de05a638430c70cf51902367d0e7d504108e6.tar nixlib-958de05a638430c70cf51902367d0e7d504108e6.tar.gz nixlib-958de05a638430c70cf51902367d0e7d504108e6.tar.bz2 nixlib-958de05a638430c70cf51902367d0e7d504108e6.tar.lz nixlib-958de05a638430c70cf51902367d0e7d504108e6.tar.xz nixlib-958de05a638430c70cf51902367d0e7d504108e6.tar.zst nixlib-958de05a638430c70cf51902367d0e7d504108e6.zip | |
Merge pull request #9056 from spencerjanssen/resume-fix
stage-1: fix typo that breaks resume
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 26cf7f06c9ed..480bbfa2b07b 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -184,7 +184,7 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then # https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1 # when there are multiple swap devices, we can't know where the hibernate # image will reside. We can check all of them for swsuspend blkid. - resumeInfo="$(test -e "$d" && udevadm info -q property "$sd")" + resumeInfo="$(test -e "$sd" && udevadm info -q property "$sd")" if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then resumeDev="$sd" break |