b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Shut up "failed to resume" warning if there is no resume device

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-30 17:28:12 +01:00
parent be5d3a59dd
commit d882e19662
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/stage-1-init.sh
View file

@ -168,7 +168,7 @@ if test -e /sys/power/tuxonice/resume; then
fi
fi
if test -e /sys/power/resume -a -e /sys/power/disk; then
if test -n "@resumeDevice@" -a -e /sys/power/resume -a -e /sys/power/disk; then
echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
echo shutdown > /sys/power/disk
fi

14
nixos/modules/system/boot/stage-1.nix
View file

@ -229,12 +229,14 @@ in
options = {
boot.resumeDevice = mkOption {
default = "";
example = "0:0";
description = "
Device for manual resume attempt during boot. Looks like
major:minor. ls -l /dev/SWAP_PARTION shows them.
";
type = types.nullOr types.str;
default = null;
example = "8:2";
description = ''
Device for manual resume attempt during boot, specified using
the device's major and minor number as
<literal><replaceable>major</replaceable>:<replaceable>minor</replaceable></literal>.
'';
};
boot.initrd.checkJournalingFS = mkOption {