summaryrefslogtreecommitdiff
path: root/src/init/s6-linux-init-telinit.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-01-27 17:33:39 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2021-01-27 17:33:39 +0000
commit355a75e08bbc8af8af97576bad07471dd1b431d8 (patch)
tree1fb9383f9b289cb290adda3b5b73aadaecd660c5 /src/init/s6-linux-init-telinit.c
parent42b0e2b3c7e40c3cb27973e97edf686daf1b930c (diff)
downloads6-linux-init-355a75e08bbc8af8af97576bad07471dd1b431d8.tar.xz
bugfix: actually log to catch-all in shutdownd.
Also support more options in telinit.
Diffstat (limited to 'src/init/s6-linux-init-telinit.c')
-rw-r--r--src/init/s6-linux-init-telinit.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/init/s6-linux-init-telinit.c b/src/init/s6-linux-init-telinit.c
index 3c8d3fe..2baa6c2 100644
--- a/src/init/s6-linux-init-telinit.c
+++ b/src/init/s6-linux-init-telinit.c
@@ -25,18 +25,21 @@ int main (int argc, char const *const *argv, char const *const *envp)
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
- int opt = subgetopt_r(argc, argv, "CBc:p:s:m:d:D:", &l) ;
+ int opt = subgetopt_r(argc, argv, "c:p:s:m:d:D:nNCB", &l) ;
if (opt == -1) break ;
switch (opt)
{
- case 'C' : /* s6-linux-init may be called with these options, don't choke on them */
- case 'B' :
- case 'c' :
+ case 'c' : /* s6-linux-init may be called with these options, don't choke on them */
case 'p' :
case 's' :
case 'm' :
case 'd' :
- case 'D' : break ;
+ case 'D' :
+ case 'n' :
+ case 'N' :
+ case 'C' :
+ case 'B' :
+ break ;
default : dieusage() ;
}
}