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-w32-2c0508b4facf24d55518fe13bcbef4b23c13c9cb.tar.gz busybox-w32-2c0508b4facf24d55518fe13bcbef4b23c13c9cb.tar.bz2 busybox-w32-2c0508b4facf24d55518fe13bcbef4b23c13c9cb.zip |
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 @@ | |||
15 | # the specified process to run on. The contents of this field are | 15 | # the specified process to run on. The contents of this field are |
16 | # appended to "/dev/" and used as-is. There is no need for this field to | 16 | # appended to "/dev/" and used as-is. There is no need for this field to |
17 | # be unique, although if it isn't you may have strange results. If this | 17 | # be unique, although if it isn't you may have strange results. If this |
18 | # field is left blank, it is completely ignored. Also note that if | 18 | # field is left blank, then the init's stdin/out will be used. |
19 | # BusyBox detects that a serial console is in use, then all entries | ||
20 | # containing non-empty id fields will be ignored. BusyBox init does | ||
21 | # nothing with utmp. We don't need no stinkin' utmp. | ||
22 | # | 19 | # |
23 | # <runlevels>: The runlevels field is completely ignored. | 20 | # <runlevels>: The runlevels field is completely ignored. |
24 | # | 21 | # |
@@ -43,9 +40,6 @@ | |||
43 | # ::shutdown:/sbin/swapoff -a | 40 | # ::shutdown:/sbin/swapoff -a |
44 | # ::shutdown:/bin/umount -a -r | 41 | # ::shutdown:/bin/umount -a -r |
45 | # ::restart:/sbin/init | 42 | # ::restart:/sbin/init |
46 | # | ||
47 | # if it detects that /dev/console is _not_ a serial console, it will | ||
48 | # also run: | ||
49 | # tty2::askfirst:/bin/sh | 43 | # tty2::askfirst:/bin/sh |
50 | # tty3::askfirst:/bin/sh | 44 | # tty3::askfirst:/bin/sh |
51 | # tty4::askfirst:/bin/sh | 45 | # 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) | |||
1234 | //usage: " ::shutdown:/sbin/swapoff -a\n" | 1234 | //usage: " ::shutdown:/sbin/swapoff -a\n" |
1235 | //usage: " ::shutdown:/bin/umount -a -r\n" | 1235 | //usage: " ::shutdown:/bin/umount -a -r\n" |
1236 | //usage: " ::restart:/sbin/init\n" | 1236 | //usage: " ::restart:/sbin/init\n" |
1237 | //usage: "\n" | ||
1238 | //usage: "if it detects that /dev/console is _not_ a serial console, it will also run:\n" | ||
1239 | //usage: "\n" | ||
1240 | //usage: " tty2::askfirst:/bin/sh\n" | 1237 | //usage: " tty2::askfirst:/bin/sh\n" |
1241 | //usage: " tty3::askfirst:/bin/sh\n" | 1238 | //usage: " tty3::askfirst:/bin/sh\n" |
1242 | //usage: " tty4::askfirst:/bin/sh\n" | 1239 | //usage: " tty4::askfirst:/bin/sh\n" |
@@ -1252,11 +1249,7 @@ int init_main(int argc UNUSED_PARAM, char **argv) | |||
1252 | //usage: " the specified process to run on. The contents of this field are\n" | 1249 | //usage: " the specified process to run on. The contents of this field are\n" |
1253 | //usage: " appended to \"/dev/\" and used as-is. There is no need for this field to\n" | 1250 | //usage: " appended to \"/dev/\" and used as-is. There is no need for this field to\n" |
1254 | //usage: " be unique, although if it isn't you may have strange results. If this\n" | 1251 | //usage: " be unique, although if it isn't you may have strange results. If this\n" |
1255 | //usage: " field is left blank, the controlling tty is set to the console. Also\n" | 1252 | //usage: " field is left blank, then the init's stdin/out will be used.\n" |
1256 | //usage: " note that if BusyBox detects that a serial console is in use, then only\n" | ||
1257 | //usage: " entries whose controlling tty is either the serial console or /dev/null\n" | ||
1258 | //usage: " will be run. BusyBox init does nothing with utmp. We don't need no\n" | ||
1259 | //usage: " stinkin' utmp.\n" | ||
1260 | //usage: "\n" | 1253 | //usage: "\n" |
1261 | //usage: " <runlevels>:\n" | 1254 | //usage: " <runlevels>:\n" |
1262 | //usage: "\n" | 1255 | //usage: "\n" |