Update the sample inittab to add the "ctrlaltdel" action.

Note a bug in busybox init that I need to fix.
 -Erik

git-svn-id: svn://busybox.net/trunk/busybox@359 69ca8d6d-28ef-0310-b511-8ec308f3f277

diff --git a/TODO b/TODO
index 51a0d14..1c3b460 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,6 +10,10 @@ around to it some time. If you have any good ideas, please let me know.
     separate package (named perhaps tiny-netkit?).  This currently includes 
     hostid, hostname, mnc, and ping.
 
     separate package (named perhaps tiny-netkit?).  This currently includes 
     hostid, hostname, mnc, and ping.
 

+* init's waitfor() calls wait() which can catch and ignore the wrong pid 
+    exiting.  That other process is then not restarted.
+
+

 
  -Erik
 
 
  -Erik
 

diff --git a/examples/inittab b/examples/inittab
index dc8e921..bb547b7 100644 (file)
--- a/examples/inittab
+++ b/examples/inittab
@@ -23,7 +23,8 @@
 #
 # <runlevels>: The runlevels field is completely ignored.
 #
 #
 # <runlevels>: The runlevels field is completely ignored.
 #

-# <action>: Valid actions include: sysinit, respawn, askfirst, wait, and once.
+# <action>: Valid actions include: sysinit, respawn, askfirst, wait, once, 
+#                                  and ctrlaltdel.

 #
 #       Note: askfirst acts just like respawn, but before running the specified
 #       process it displays the line "Please press Enter to activate this
 #
 #       Note: askfirst acts just like respawn, but before running the specified
 #       process it displays the line "Please press Enter to activate this


@@ -70,6 +71,7 @@ tty5::respawn:/sbin/getty 38400 tty5
 # Example how to put a getty on a modem line.
 #ttyS2::respawn:/sbin/getty -x0 -s 57600 ttyS2
 
 # Example how to put a getty on a modem line.
 #ttyS2::respawn:/sbin/getty -x0 -s 57600 ttyS2
 

-# Not currently supported, but may be sometime in the future...
-#::ctrlaltdel:/sbin/reboot
+# Stuff to do before rebooting
+::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1
+::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1

 
 

diff --git a/scripts/inittab b/scripts/inittab
index dc8e921..bb547b7 100644 (file)
--- a/scripts/inittab
+++ b/scripts/inittab
@@ -23,7 +23,8 @@
 #
 # <runlevels>: The runlevels field is completely ignored.
 #
 #
 # <runlevels>: The runlevels field is completely ignored.
 #

-# <action>: Valid actions include: sysinit, respawn, askfirst, wait, and once.
+# <action>: Valid actions include: sysinit, respawn, askfirst, wait, once, 
+#                                  and ctrlaltdel.

 #
 #       Note: askfirst acts just like respawn, but before running the specified
 #       process it displays the line "Please press Enter to activate this
 #
 #       Note: askfirst acts just like respawn, but before running the specified
 #       process it displays the line "Please press Enter to activate this


@@ -70,6 +71,7 @@ tty5::respawn:/sbin/getty 38400 tty5
 # Example how to put a getty on a modem line.
 #ttyS2::respawn:/sbin/getty -x0 -s 57600 ttyS2
 
 # Example how to put a getty on a modem line.
 #ttyS2::respawn:/sbin/getty -x0 -s 57600 ttyS2
 

-# Not currently supported, but may be sometime in the future...
-#::ctrlaltdel:/sbin/reboot
+# Stuff to do before rebooting
+::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1
+::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1