diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-04-29 00:06:26 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-04-29 00:06:26 +0000 |
| commit | 6a57daba8c0ebf143cec2dd4b133c8c662f86857 (patch) | |
| tree | 905f670f275c9cf0d016d3de9eea0fcecc511aba /src/init | |
| parent | 26f83a95417ff2e5866d6fefab4d737509761622 (diff) | |
| download | s6-linux-init-6a57daba8c0ebf143cec2dd4b133c8c662f86857.tar.xz | |
-d slashdev, not -d dev_type! Fix and update the doc.
Diffstat (limited to 'src/init')
| -rw-r--r-- | src/init/s6-linux-init-maker.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c index 1326583..4b0d4af 100644 --- a/src/init/s6-linux-init-maker.c +++ b/src/init/s6-linux-init-maker.c @@ -45,7 +45,7 @@ static char const *robase = BASEDIR ; static char const *initial_path = INITPATH ; static char const *env_store = 0 ; static char const *early_getty = 0 ; -static char const *slashdev = "2" ; +static char const *slashdev = 0 ; static char const *log_user = "root" ; static char const *initdefault = 0 ; static unsigned int initial_umask = 0022 ; @@ -587,6 +587,8 @@ int main (int argc, char const *const *argv, char const *const *envp) if (robase[0] != '/') strerr_dief3x(100, "base directory ", robase, " is not absolute") ; + if (slashdev && slashdev[0] != '/') + strerr_dief3x(100, "devtmpfs directory ", slashdev, " is not absolute") ; if (env_store) { if (env_store[0] != '/') @@ -596,11 +598,6 @@ int main (int argc, char const *const *argv, char const *const *envp) } if (timestamp_style > 3) strerr_dief1x(100, "-t timestamp_style must be 0, 1, 2 or 3") ; - { - unsigned int u ; - if (!uint0_scan(slashdev, &u) || u > 2) - strerr_dief1x(100, "-d dev_style must be 0, 1 or 2") ; - } umask(0) ; if (mkdir(argv[0], 0755) < 0) |