- rename suspend boot script in resume

- update-initramfs add -b bootdif flag
  document it
- check for noresume arg in init

5 files changed, 44 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index bbc2944..9623ae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,22 @@
-initramfs-tools (0.68) unstable; urgency=high
+initramfs-tools (0.69) unstable; urgency=low
+
+  * scripts/local-premount/suspend, scripts/local-premount/resume: Rename
+    to the later as the script resumes from resume arg.
+
+  * init: Parse for noresume and only export resume if it is not set.
+    Allows boot scripts to check for it's eventual existence.
+    Thanks David Härdeman <david@2gen.com> for the suggestion.
+
+  * update-initramfs: Add option "-b directory" to override BOOTDIR.
+    Allows the initramfs to be created in another dir without awkward
+    mkinitramfs invocation. Check that the passed arg is really a dir. 
+    (ubuntu: 37690) Thanks Colin Watson <cjwatson@debian.org>
+
+  * update-initramfs.8: Document -b switch.
+
+ -- maximilian attems <maks@sternwelten.at>  Wed, 12 Jul 2006 16:51:49 +0200
+
+initramfs-tools (0.68b) unstable; urgency=high
 
   * script/functions, hook-functions: Move check_minkver() to the second
     file as it uses dpkg and is run by mkinitramfs and not on boot.
@@ -19,11 +37,12 @@ initramfs-tools (0.68) unstable; urgency=high
     to the one we ship. This should minimize Sarge upgrade prompting if no
     relevant modules where added to /etc/mkinitrd/modules.
 
-  * conf/initramfs.conf: Make it more similar to /etc/mkinitrd/modules.
+  * conf/modules: Make it more similar to /etc/mkinitrd/modules.
 
   * Set urgency high for RC fixes upload.
+    Thanks Steinar H. Gunderson <sesse@debian.org> for the review.
 
- -- maximilian attems <maks@sternwelten.at>  Fri,  7 Jul 2006 11:45:56 +0200
+ -- maximilian attems <maks@sternwelten.at>  Mon, 10 Jul 2006 00:13:52 +0200
 
 initramfs-tools (0.67) unstable; urgency=high
 
diff --git a/init b/init
index 2c25295..427b964 100755
--- a/init
+++ b/init
@@ -40,7 +40,6 @@ export break=
 export init=/sbin/init
 export quiet=n
 export readonly=y
-export resume=${RESUME}
 export rootmnt=/root
 export debug=
 export cryptopts=${CRYPTOPTS}
@@ -77,7 +76,10 @@ for x in $(cat /proc/cmdline); do
 		BOOT=${x#boot=}
 		;;
 	resume=*)
-		resume=${x#resume=}
+		RESUME=${x#resume=}
+		;;
+	noresume)
+		NORESUME=y
 		;;
 	quiet)
 		quiet=y
@@ -102,6 +104,10 @@ for x in $(cat /proc/cmdline); do
 	esac
 done
 
+if [ -n ${NORESUME} ]; then
+        export resume=${RESUME}
+fi
+
 depmod -a
 maybe_break top
 
diff --git a/scripts/local-premount/suspend b/scripts/local-premount/resume
index 0c88ccc..0c88ccc 100755
--- a/scripts/local-premount/suspend
+++ b/scripts/local-premount/resume
diff --git a/update-initramfs b/update-initramfs
index 1826233..71cc90d 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -19,6 +19,7 @@ Options:
  -u		Update an existing initramfs
  -d		Remove an existing initramfs
  -t		Take over a custom initramfs with this one
+ -b		Set alternate boot directory
  -v		Be verbose
  -h		This message
 
@@ -287,7 +288,7 @@ takeover=0
 
 ##
 
-while getopts "k:cudyvht?" flag; do
+while getopts "k:cudyvtb:h?" flag; do
 	case "${flag}" in
 	k)
 		version="${OPTARG}"	
@@ -310,6 +311,13 @@ while getopts "k:cudyvht?" flag; do
 	t)
 		takeover="1"
 		;;
+	b)
+		BOOTDIR="${OPTARG}"	
+		if [ ! -d $BOOTDIR ]; then
+			echo "Error: ${BOOTDIR} is not a directory."
+			exit 1
+		fi
+		;;
 	h|?)
 		usage
 		;;
diff --git a/update-initramfs.8 b/update-initramfs.8
index 71f2500..9590ca3 100644
--- a/update-initramfs.8
+++ b/update-initramfs.8
@@ -11,6 +11,7 @@ update-initramfs \- generate an initramfs image
 .RB [ \-u ] 
 .RB [ \-t ] 
 .RB [ \-v ] 
+.RB [ \-b ] 
 .RB [ \-h ] 
 .SH DESCRIPTION
 The
@@ -53,6 +54,10 @@ This option increases the amount of information you are given during
 the chosen action.
 
 .TP
+\fB \-b
+Set an different bootdir for the image creation.
+
+.TP
 \fB \-h
 Print a short help page describing the available options in 
 .B update-initramfs.