diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-02-01 19:36:56 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-02-01 19:36:56 +0000 |
| commit | f3b9454a195c854e2cfa63c510251936df0d1ab7 (patch) | |
| tree | f303fd18e37df4c0b8c3840d1f8a534d829446f6 /package/busybox/busybox-1.13.2-init.patch | |
| parent | 32521c03bdb5214143228bd8ff725c6d5b93f7cd (diff) | |
busybox: additional 1.13.2 fixes
Diffstat (limited to 'package/busybox/busybox-1.13.2-init.patch')
| -rw-r--r-- | package/busybox/busybox-1.13.2-init.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.13.2-init.patch b/package/busybox/busybox-1.13.2-init.patch new file mode 100644 index 000000000..1d98467ac --- /dev/null +++ b/package/busybox/busybox-1.13.2-init.patch @@ -0,0 +1,50 @@ +--- busybox-1.13.2/init/init.c Wed Dec 31 04:06:45 2008 ++++ busybox-1.13.2-init/init/init.c Thu Jan 29 03:02:13 2009 +@@ -671,15 +671,14 @@ + */ + static void parse_inittab(void) + { ++#if ENABLE_FEATURE_USE_INITTAB + char *token[4]; +- /* order must correspond to SYSINIT..RESTART constants */ +- static const char actions[] ALIGN1 = +- "sysinit\0""respawn\0""askfirst\0""wait\0""once\0" +- "ctrlaltdel\0""shutdown\0""restart\0"; ++ parser_t *parser = config_open2("/etc/inittab", fopen_for_read); + +- parser_t *parser = config_open2(INITTAB, fopen_for_read); +- /* No inittab file -- set up some default behavior */ +- if (parser == NULL) { ++ if (parser == NULL) ++#endif ++ { ++ /* No inittab file -- set up some default behavior */ + /* Reboot on Ctrl-Alt-Del */ + new_init_action(CTRLALTDEL, "reboot", ""); + /* Umount all filesystems on halt/reboot */ +@@ -699,11 +698,17 @@ + new_init_action(SYSINIT, INIT_SCRIPT, ""); + return; + } ++ ++#if ENABLE_FEATURE_USE_INITTAB + /* optional_tty:ignored_runlevel:action:command + * Delims are not to be collapsed and need exactly 4 tokens + */ + while (config_read(parser, token, 4, 0, "#:", + PARSE_NORMAL & ~(PARSE_TRIM | PARSE_COLLAPSE))) { ++ /* order must correspond to SYSINIT..RESTART constants */ ++ static const char actions[] ALIGN1 = ++ "sysinit\0""respawn\0""askfirst\0""wait\0""once\0" ++ "ctrlaltdel\0""shutdown\0""restart\0"; + int action; + char *tty = token[0]; + +@@ -727,6 +732,7 @@ + parser->lineno); + } + config_close(parser); ++#endif + } + + #if ENABLE_FEATURE_USE_INITTAB |