summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2005-12-28 01:28:31 +0100
committermaximilian attems <maks@debian.org>2005-12-28 01:28:31 +0100
commite0de055ba1a1c32acb70f92ec65bf23139b73b8f (patch)
treed93f113647749a79b30457959dc79424bcfde600
parent05982a63b2425a309325ba7a945a4bb11fd6146d (diff)
downloadinitramfs-tools-e0de055ba1a1c32acb70f92ec65bf23139b73b8f.tar.gz
initramfs-tools-e0de055ba1a1c32acb70f92ec65bf23139b73b8f.zip
fix passing of the debug param to init.
-rw-r--r--debian/changelog6
-rwxr-xr-xinit5
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8b14a93..b53ff18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+initramfs-tools (0.45) unstable; urgency=low
+
+ * Unset debug before calling init, confuses /etc/init.d/rc.
+
+ -- maximilian attems <maks@sternwelten.at> Tue, 27 Dec 2005 19:12:31 +0100
+
initramfs-tools (0.44) unstable; urgency=high
"O partigiano portami via"
diff --git a/init b/init
index 1f6c732..db18f15 100755
--- a/init
+++ b/init
@@ -105,6 +105,11 @@ while [ ! -x ${rootmnt}${init} ]; do
panic "Target filesystem doesn't have ${init}"
done
+# Confuses /etc/init.d/rc
+if [ -n ${debug} ]; then
+ unset debug
+fi
+
# Chain to real filesystem
maybe_break init
exec run-init ${rootmnt} ${init} "$@" <${rootmnt}/dev/console >${rootmnt}/dev/console