diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-11 17:32:53 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-11 18:18:36 +0200 |
| commit | 388dac478d21b743946362294043b83da4852721 (patch) | |
| tree | 338b0a8d5a896055c90d68831ae0eac404230ce9 /nixos/modules/system | |
| parent | 76055df52de56f92aad34c774e24d606722252fb (diff) | |
| download | nixlib-388dac478d21b743946362294043b83da4852721.tar nixlib-388dac478d21b743946362294043b83da4852721.tar.gz nixlib-388dac478d21b743946362294043b83da4852721.tar.bz2 nixlib-388dac478d21b743946362294043b83da4852721.tar.lz nixlib-388dac478d21b743946362294043b83da4852721.tar.xz nixlib-388dac478d21b743946362294043b83da4852721.tar.zst nixlib-388dac478d21b743946362294043b83da4852721.zip | |
stage-1: Shut up warnings about swap devices that don't exist yet
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 5af644279e5f..a6df6216ddb4 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -182,9 +182,9 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then for sd in @resumeDevices@; do # Try to detect resume device. According to Ubuntu bug: # https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1 - # When there are multiple swap devices, we can't know where will hibernate - # image reside. We can check all of them for swsuspend blkid. - resumeInfo="$(udevadm info -q property "$sd" )" + # 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")" if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then resumeDev="$sd" break |