Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.kernel > #57618

[PATCH initramfs-tools 6/9] Allow disabling resume from disk at build time by setting RESUME=none

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 hooks/resume     | 3 ++-
 init             | 4 ++--
 initramfs.conf.5 | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hooks/resume b/hooks/resume
index e8a49124c3f9..3e3f6dbbc3b6 100755
--- a/hooks/resume
+++ b/hooks/resume
@@ -16,7 +16,8 @@ prereqs)
 esac
 
 # First check if a location is set and is a valid swap partition
-if [ -n "$RESUME" ] && blkid -p -n swap $RESUME >/dev/null 2>&1; then
+if [ -n "$RESUME" ] && \
+   { [ "$RESUME" = none ] || blkid -p -n swap $RESUME >/dev/null 2>&1; }; then
 	# As mkinitramfs copies the config file nothing to do.
 	exit 0
 fi
diff --git a/init b/init
index 9552e5cab9c0..1334dca6a99d 100755
--- a/init
+++ b/init
@@ -189,8 +189,8 @@ if [ -z "${BOOT}" ]; then
 	BOOT=local
 fi
 
-if [ -n "${noresume}" ]; then
-	export noresume
+if [ -n "${noresume}" ] || [ "$RESUME" = none ]; then
+	export noresume=y
 	unset resume
 else
 	resume=${RESUME:-}
diff --git a/initramfs.conf.5 b/initramfs.conf.5
index 4d142dd0950a..c0d778ca1928 100644
--- a/initramfs.conf.5
+++ b/initramfs.conf.5
@@ -81,6 +81,7 @@ Specifies the device used for suspend-to-disk (hibernation), which the
 initramfs code should attempt to resume from.  If this is not defined,
 .B mkinitramfs
 will automatically select the largest available swap partition.
+Set it to \fInone\fP to disable resume from disk.
 
 .SH VARIABLES FOR NFS BOOT
 .TP

Back to linux.debian.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH initramfs-tools 0/9] Fix resume device configuration Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 05:40 +0200
  [PATCH initramfs-tools 1/9] hooks/resume: Use correct sort options  to select the biggest swap partition Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 05:40 +0200
  [PATCH initramfs-tools 3/9] Support setting of RESUME in  initramfs.conf or anywhere in conf.d/ Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 05:40 +0200
  [PATCH initramfs-tools 6/9] Allow disabling resume from disk at  build time by setting RESUME=none Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 05:40 +0200
  [PATCH initramfs-tools 5/9] hooks/resume: Check for chroot earlier Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 05:40 +0200
  [PATCH initramfs-tools 9/9] NEWS: Add entry explaining the need for  RESUME=none on some systems Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 05:40 +0200
  [PATCH initramfs-tools 2/9] initramfs.conf(5): Clean up split  between general and NFS variables Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 05:40 +0200
  [PATCH initramfs-tools 7/9] Support requesting automatic selection  of resume device with RESUME=auto Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 05:40 +0200
  [PATCH initramfs-tools 8/9] hooks/resume: Report when we might be  doing something surprising Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 05:40 +0200
  Re: [PATCH initramfs-tools 0/9] Fix resume device configuration Martin Steigerwald <martin@lichtvoll.de> - 2017-04-21 11:10 +0200
    Re: [PATCH initramfs-tools 0/9] Fix resume device configuration Ben Hutchings <ben@decadent.org.uk> - 2017-04-21 17:20 +0200
  Re: [PATCH initramfs-tools 0/9] Fix resume device configuration Michael Prokop <mika@debian.org> - 2017-04-21 14:30 +0200
  Re: [PATCH initramfs-tools 0/9] Fix resume device configuration Bjørn Mork <bjorn@mork.no> - 2017-04-24 09:50 +0200
    Re: [PATCH initramfs-tools 0/9] Fix resume device configuration Ben Hutchings <ben@decadent.org.uk> - 2017-04-26 05:40 +0200

csiph-web