summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2007-05-01 18:59:39 +0200
committermaximilian attems <maks@debian.org>2007-05-01 18:59:39 +0200
commit8800b09a519db23e0fefd32868a57c45c0a013e8 (patch)
tree95fd9f6a097dd2bc32663691b85cfb376908631b
parentb65e2e814325991ea130c3a176024f6a7e416c46 (diff)
downloadinitramfs-tools-8800b09a519db23e0fefd32868a57c45c0a013e8.tar.gz
initramfs-tools-8800b09a519db23e0fefd32868a57c45c0a013e8.zip
init: Remove cryptopts parsing
the cryptsetup scripts parse /proc/cmdline themselves (even in the Etch version).
-rw-r--r--debian/changelog7
-rwxr-xr-xinit4
2 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index b5eff37..8932889 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
initramfs-tools (0.88) UNRELEASED; urgency=low
+ [ maximilian attems ]
* debian/changelog: Fix missing colons in closes.
* hook-functions: Add a proper /sys walking dep_add_modules() for a minimal
@@ -8,7 +9,11 @@ initramfs-tools (0.88) UNRELEASED; urgency=low
* mkinitramfs.8: Add examples section, plus improve description of the
low-level tool and how it fits with update-initramfs.
- -- maximilian attems <maks@debian.org> Tue, 01 May 2007 18:48:03 +0200
+ [ David Härdeman ]
+ * init: Remove cryptopts parsing, not official bootparam. cryptsetup scripts
+ parse /proc/cmdline themselves (even in the Etch version).
+
+ -- maximilian attems <maks@debian.org> Tue, 01 May 2007 18:56:40 +0200
initramfs-tools (0.87b) unstable; urgency=low
diff --git a/init b/init
index b115cd1..7de409a 100755
--- a/init
+++ b/init
@@ -47,7 +47,6 @@ export quiet=n
export readonly=y
export rootmnt=/root
export debug=
-export cryptopts=${CRYPTOPTS}
export ROOTDELAY=
export panic=
export blacklist=
@@ -81,9 +80,6 @@ for x in $(cat /proc/cmdline); do
rootdelay=*)
ROOTDELAY="${x#rootdelay=}"
;;
- cryptopts=*)
- cryptopts="${x#cryptopts=}"
- ;;
nfsroot=*)
NFSROOT="${x#nfsroot=}"
;;