From 355a75e08bbc8af8af97576bad07471dd1b431d8 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 27 Jan 2021 17:33:39 +0000 Subject: bugfix: actually log to catch-all in shutdownd. Also support more options in telinit. --- src/init/s6-linux-init-telinit.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/init') 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() ; } } -- cgit v1.2.3