diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-03-29 14:35:44 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-03-29 14:35:44 +0100 |
| commit | 2c0508b4facf24d55518fe13bcbef4b23c13c9cb (patch) | |
| tree | 73887c6741dd3f0e69788b45c4a4e29a8579be74 | |
| parent | 8172d054db64bc80a355db111b484719930045bc (diff) | |
| download | busybox-2c0508b4facf24d55518fe13bcbef4b23c13c9cb.tar.gz | |
examples/inittab: fix a few incorrect statements about init
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | examples/inittab | 8 | ||||
| -rw-r--r-- | init/init.c | 9 |
2 files changed, 2 insertions, 15 deletions
diff --git a/examples/inittab b/examples/inittab index c4e0af514..01ceaef25 100644 --- a/examples/inittab +++ b/examples/inittab @@ -15,10 +15,7 @@ # the specified process to run on. The contents of this field are # appended to "/dev/" and used as-is. There is no need for this field to # be unique, although if it isn't you may have strange results. If this -# field is left blank, it is completely ignored. Also note that if -# BusyBox detects that a serial console is in use, then all entries -# containing non-empty id fields will be ignored. BusyBox init does -# nothing with utmp. We don't need no stinkin' utmp. +# field is left blank, then the init's stdin/out will be used. # # <runlevels>: The runlevels field is completely ignored. # @@ -43,9 +40,6 @@ # ::shutdown:/sbin/swapoff -a # ::shutdown:/bin/umount -a -r # ::restart:/sbin/init -# -# 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 diff --git a/init/init.c b/init/init.c index b84bdccbc..15aad474f 100644 --- a/init/init.c +++ b/init/init.c @@ -1234,9 +1234,6 @@ int init_main(int argc UNUSED_PARAM, char **argv) //usage: " ::shutdown:/sbin/swapoff -a\n" //usage: " ::shutdown:/bin/umount -a -r\n" //usage: " ::restart:/sbin/init\n" -//usage: "\n" -//usage: "if it detects that /dev/console is _not_ a serial console, it will also run:\n" -//usage: "\n" //usage: " tty2::askfirst:/bin/sh\n" //usage: " tty3::askfirst:/bin/sh\n" //usage: " tty4::askfirst:/bin/sh\n" @@ -1252,11 +1249,7 @@ int init_main(int argc UNUSED_PARAM, char **argv) //usage: " the specified process to run on. The contents of this field are\n" //usage: " appended to \"/dev/\" and used as-is. There is no need for this field to\n" //usage: " be unique, although if it isn't you may have strange results. If this\n" -//usage: " field is left blank, the controlling tty is set to the console. Also\n" -//usage: " note that if BusyBox detects that a serial console is in use, then only\n" -//usage: " entries whose controlling tty is either the serial console or /dev/null\n" -//usage: " will be run. BusyBox init does nothing with utmp. We don't need no\n" -//usage: " stinkin' utmp.\n" +//usage: " field is left blank, then the init's stdin/out will be used.\n" //usage: "\n" //usage: " <runlevels>:\n" //usage: "\n" |