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

2 files changed, 9 insertions, 7 deletions

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index e3e07c0858085..1f65026b5defb 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -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
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 3836d639513ea..71dc29feb2a85 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -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 {