From 6fd917d49cd09c5124df25c48e1458e1a87f2365 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Tue, 1 May 2007 19:35:45 +0200 Subject: init: ignore non-numeric rootdelay, panic bootargs they cause funny sleep error messages: aka you can't sleep "bar" time ;) take into account that subsecond sleeps are ok. thanks david for the idea, gone for the q&d regex check. --- debian/changelog | 3 ++- init | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 40363ad..b436b0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ initramfs-tools (0.88) UNRELEASED; urgency=low initramfs on MODULES=dep. (closes: #395526) * mkinitramfs.8: Add examples section, plus improve description of the low-level tool and how it fits with update-initramfs. + * init: Ignore non-numerical panic and rootdelay bootarg. [ David Härdeman ] * init: Remove cryptopts parsing, not official bootparam. cryptsetup scripts @@ -14,7 +15,7 @@ initramfs-tools (0.88) UNRELEASED; urgency=low destination path if only one argument is given. * hook-funcions: document how copy_exec determines the target path. - -- maximilian attems Tue, 01 May 2007 19:23:10 +0200 + -- maximilian attems Tue, 01 May 2007 19:31:41 +0200 initramfs-tools (0.87b) unstable; urgency=low diff --git a/init b/init index 7de409a..0da01d4 100755 --- a/init +++ b/init @@ -79,6 +79,11 @@ for x in $(cat /proc/cmdline); do ;; rootdelay=*) ROOTDELAY="${x#rootdelay=}" + case ${ROOTDELAY} in + *[![:digit:].]*) + ROOTDELAY= + ;; + esac ;; nfsroot=*) NFSROOT="${x#nfsroot=}" @@ -97,6 +102,11 @@ for x in $(cat /proc/cmdline); do ;; panic=*) panic="${x#panic=}" + case ${panic} in + *[![:digit:].]*) + panic= + ;; + esac ;; quiet) quiet=y -- cgit v1.2.3