summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-11-11 12:39:44 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-11-11 12:39:44 +0000
commitc1171b979c236ec2c486bc12e4866112a12b9a84 (patch)
tree2c56951a361fb3c7d5558be7b92da6e24c6e6f20
parentfd2bae7c95db47318d82ea08398063e402953e19 (diff)
downloads6-linux-init-c1171b979c236ec2c486bc12e4866112a12b9a84.tar.xz
Accept 1 as cmdline runlevel; fix rc.shutdown comment for s6-rc
-rwxr-xr-xskel/rc.shutdown2
-rw-r--r--src/init/s6-linux-init.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/skel/rc.shutdown b/skel/rc.shutdown
index 4608be7..0b6bf4b 100755
--- a/skel/rc.shutdown
+++ b/skel/rc.shutdown
@@ -27,4 +27,4 @@
# exec /sbin/openrc shutdown
### If your services are managed by s6-rc:
-# exec s6-rc -v2 -bda change
+# exec s6-rc -v2 -bDa change
diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c
index 2e22850..c68d0f9 100644
--- a/src/init/s6-linux-init.c
+++ b/src/init/s6-linux-init.c
@@ -41,7 +41,7 @@ static inline char const *scan_cmdline (char const *initdefault, char const *con
{
if (!inns)
{
- static char const *valid[] = { "default", "2", "3", "4", "5", 0 } ;
+ static char const *valid[] = { "default", "1", "2", "3", "4", "5", 0 } ;
for (unsigned int i = 0 ; i < argc ; i++)
for (char const *const *p = valid ; *p ; p++)
if (!strcmp(argv[i], *p)) return argv[i] ;