Fix up the sample inittab entry per what is current.

 -Erik

diff --git a/examples/inittab b/examples/inittab
index 13a04afdccbb3c6ef3de4706cd1c6a504a84d860..8e7e945b3d562fa8c11e73d4e0f43b59a2f87326 100644 (file)
--- a/examples/inittab
+++ b/examples/inittab
@@ -24,7 +24,7 @@
 # <runlevels>: The runlevels field is completely ignored.
 #
 # <action>: Valid actions include: sysinit, respawn, askfirst, wait, once, 
-#                                  and ctrlaltdel.
+#                                  ctrlaltdel, and shutdown.
 #
 #       Note: askfirst acts just like respawn, but before running the specified
 #       process it displays the line "Please press Enter to activate this
@@ -36,14 +36,19 @@
 #
 # <process>: Specifies the process to be executed and it's command line.
 #
-# Note: BusyBox init works just fine without an inittab.  If no inittab
-# is found, it has the following default behavior:
-#      ::sysinit:/etc/init.d/rcS
-#      ::askfirst:/bin/sh
-# if it detects that /dev/console is _not_ a serial console, it will also run:
-#      tty2::askfirst:/bin/sh
+# Note: BusyBox init works just fine without an inittab. If no inittab is
+# found, it has the following default behavior:
+#         ::sysinit:/etc/init.d/rcS
+#         ::askfirst:/bin/sh
+#         ::ctrlaltdel:/sbin/reboot
+#         ::shutdown:/sbin/swapoff -a
+#         ::shutdown:/bin/umount -a -r
+# if it detects that /dev/console is _not_ a serial console, it will
+# also run:
+#         tty2::askfirst:/bin/sh
+#         tty3::askfirst:/bin/sh
+#         tty4::askfirst:/bin/sh
 #
-
 # Boot-time system configuration/initialization script.
 # This is run first except when booting in single-user mode.
 #
@@ -56,28 +61,26 @@
 # login, but since we are bypassing login in this case, BusyBox lets you do
 # this yourself...
 #
-# Start an "askfirst" shell on the console (whatever that may be).
+# Start an "askfirst" shell on the console (whatever that may be)
 ::askfirst:-/bin/sh
-#
 # Start an "askfirst" shell on /dev/tty2-4
 tty2::askfirst:-/bin/sh
 tty3::askfirst:-/bin/sh
 tty4::askfirst:-/bin/sh
 
 # /sbin/getty invocations for selected ttys
-#
-tty5::respawn:/sbin/getty 38400 tty5
-tty6::respawn:/sbin/getty 38400 tty6
+tty4::respawn:/sbin/getty 38400 tty5
+tty5::respawn:/sbin/getty 38400 tty6
 
 # Example of how to put a getty on a serial line (for a terminal)
-#
-#ttyS0::respawn:/sbin/getty -L ttyS0 9600 vt100
-#ttyS1::respawn:/sbin/getty -L ttyS1 9600 vt100
+#::respawn:/sbin/getty -L ttyS0 9600 vt100
+#::respawn:/sbin/getty -L ttyS1 9600 vt100
 #
 # Example how to put a getty on a modem line.
-#ttyS2::respawn:/sbin/getty -x0 -s 57600 ttyS2
+#::respawn:/sbin/getty 57600 ttyS2
 
 # Stuff to do before rebooting
-::ctrlaltdel:/bin/umount -a -r
-::ctrlaltdel:/sbin/swapoff -a
+::ctrlaltdel:/sbin/reboot
+::shutdown:/bin/umount -a -r
+::shutdown:/sbin/swapoff -a
 

diff --git a/scripts/inittab b/scripts/inittab
index 13a04afdccbb3c6ef3de4706cd1c6a504a84d860..8e7e945b3d562fa8c11e73d4e0f43b59a2f87326 100644 (file)
--- a/scripts/inittab
+++ b/scripts/inittab
@@ -24,7 +24,7 @@
 # <runlevels>: The runlevels field is completely ignored.
 #
 # <action>: Valid actions include: sysinit, respawn, askfirst, wait, once, 
-#                                  and ctrlaltdel.
+#                                  ctrlaltdel, and shutdown.
 #
 #       Note: askfirst acts just like respawn, but before running the specified
 #       process it displays the line "Please press Enter to activate this
@@ -36,14 +36,19 @@
 #
 # <process>: Specifies the process to be executed and it's command line.
 #
-# Note: BusyBox init works just fine without an inittab.  If no inittab
-# is found, it has the following default behavior:
-#      ::sysinit:/etc/init.d/rcS
-#      ::askfirst:/bin/sh
-# if it detects that /dev/console is _not_ a serial console, it will also run:
-#      tty2::askfirst:/bin/sh
+# Note: BusyBox init works just fine without an inittab. If no inittab is
+# found, it has the following default behavior:
+#         ::sysinit:/etc/init.d/rcS
+#         ::askfirst:/bin/sh
+#         ::ctrlaltdel:/sbin/reboot
+#         ::shutdown:/sbin/swapoff -a
+#         ::shutdown:/bin/umount -a -r
+# if it detects that /dev/console is _not_ a serial console, it will
+# also run:
+#         tty2::askfirst:/bin/sh
+#         tty3::askfirst:/bin/sh
+#         tty4::askfirst:/bin/sh
 #
-
 # Boot-time system configuration/initialization script.
 # This is run first except when booting in single-user mode.
 #
@@ -56,28 +61,26 @@
 # login, but since we are bypassing login in this case, BusyBox lets you do
 # this yourself...
 #
-# Start an "askfirst" shell on the console (whatever that may be).
+# Start an "askfirst" shell on the console (whatever that may be)
 ::askfirst:-/bin/sh
-#
 # Start an "askfirst" shell on /dev/tty2-4
 tty2::askfirst:-/bin/sh
 tty3::askfirst:-/bin/sh
 tty4::askfirst:-/bin/sh
 
 # /sbin/getty invocations for selected ttys
-#
-tty5::respawn:/sbin/getty 38400 tty5
-tty6::respawn:/sbin/getty 38400 tty6
+tty4::respawn:/sbin/getty 38400 tty5
+tty5::respawn:/sbin/getty 38400 tty6
 
 # Example of how to put a getty on a serial line (for a terminal)
-#
-#ttyS0::respawn:/sbin/getty -L ttyS0 9600 vt100
-#ttyS1::respawn:/sbin/getty -L ttyS1 9600 vt100
+#::respawn:/sbin/getty -L ttyS0 9600 vt100
+#::respawn:/sbin/getty -L ttyS1 9600 vt100
 #
 # Example how to put a getty on a modem line.
-#ttyS2::respawn:/sbin/getty -x0 -s 57600 ttyS2
+#::respawn:/sbin/getty 57600 ttyS2
 
 # Stuff to do before rebooting
-::ctrlaltdel:/bin/umount -a -r
-::ctrlaltdel:/sbin/swapoff -a
+::ctrlaltdel:/sbin/reboot
+::shutdown:/bin/umount -a -r
+::shutdown:/sbin/swapoff -a