summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-08-20 22:47:55 +0000
committerRoland McGrath <roland@gnu.org>2001-08-20 22:47:55 +0000
commit92936c6d22052d8864b45ff8a041326f3ad80f5f (patch)
treefab83951d04f8f345a6efc362e820ef8bdf99196
parentcba631268225691a2c1d28511842fdb6db88a5f9 (diff)
2001-08-20 Roland McGrath <roland@frob.com>
* runsystem.sh: Don't check for MULTIBOOT_CMDLINE environment variable. Instead, expect it as normal arguments from init.
-rw-r--r--daemons/runsystem.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/daemons/runsystem.sh b/daemons/runsystem.sh
index afedd5c9..a9bb4b5c 100644
--- a/daemons/runsystem.sh
+++ b/daemons/runsystem.sh
@@ -55,16 +55,10 @@ function singleuser ()
# We expect to be started by console-run, which gives us no arguments and
# puts FALLBACK_CONSOLE=file-name in the environment if our console is
-# other than a normal /dev/console. The MULTIBOOT_CMDLINE environment
-# variable gives us the kernel command line from the boot loader, which is
-# where any interesting boot options will be found.
+# other than a normal /dev/console.
if [ "${FALLBACK_CONSOLE+set}" = set ]; then
singleuser "Running on fallback console ${FALLBACK_CONSOLE}"
-elif [ $# -ne 0 ]; then
- singleuser "Unexpected arguments: $*"
-elif [ "${MULTIBOOT_CMDLINE+set}" != set ]; then
- singleuser "No multiboot command line!"
fi
@@ -73,7 +67,7 @@ fi
###
# Parse the multiboot command line. We only pay attention to -s and -f.
-set -- ${MULTIBOOT_CMDLINE}
+# The first argument is the kernel file name; skip that.
shift
flags=
while [ $# -gt 0 ]; do