summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rwxr-xr-xinit10
2 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 6a1d1f3..66dceea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ initramfs-tools (0.91) UNRELEASED; urgency=low
* mkinitramfs, scripts/keymap: Add trailing slash on cp destination for dir.
* init: Call panic for debug sh if run-init fails.
* init-top/framebuffer: Check that fb minor is below 32.
+ * init: Export noresume if set. uswsusp and kdump need it.
- -- maximilian attems <maks@debian.org> Sat, 01 Sep 2007 10:55:33 +0200
+ -- maximilian attems <maks@debian.org> Sat, 01 Sep 2007 13:40:24 +0200
initramfs-tools (0.90a) unstable; urgency=high
diff --git a/init b/init
index 53c228a..72b59f2 100755
--- a/init
+++ b/init
@@ -95,10 +95,10 @@ for x in $(cat /proc/cmdline); do
BOOT=${x#boot=}
;;
resume=*)
- RESUME="${x#resume=}"
+ resume="${x#resume=}"
;;
noresume)
- NORESUME=y
+ noresume=y
;;
panic=*)
panic="${x#panic=}"
@@ -138,8 +138,10 @@ for x in $(cat /proc/cmdline); do
esac
done
-if [ -z "${NORESUME}" ]; then
- export resume=${RESUME}
+if [ -z "${noresume}" ]; then
+ export resume=${resume}
+else
+ export noresume
fi
depmod -a