diff options
| author | Denys Vlasenko | 2017-08-22 11:40:27 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-08-22 11:40:27 +0200 |
| commit | 7d834c9bb436edd594ebacc48d2b9ea7d3364dbd (patch) | |
| tree | 7ef97bae0f9ec9d82c0a2de303f2bf3f7f816819 /util-linux | |
| parent | 753c4045e4f287fc4b4788afd94f58738a7f04b4 (diff) | |
| download | busybox-7d834c9bb436edd594ebacc48d2b9ea7d3364dbd.zip busybox-7d834c9bb436edd594ebacc48d2b9ea7d3364dbd.tar.gz | |
run-init: if doing dry run, do not require pid==1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/switch_root.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index 16abcb6..080b05e 100644 --- a/util-linux/switch_root.c +++ b/util-linux/switch_root.c @@ -227,9 +227,12 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv) xstat("/", &st); rootdev = st.st_dev; xstat(".", &st); - if (st.st_dev == rootdev || getpid() != 1) { + if (st.st_dev == rootdev) { // Show usage, it says new root must be a mountpoint - // and we must be PID 1 + bb_show_usage(); + } + if (!dry_run && getpid() != 1) { + // Show usage, it says we must be PID 1 bb_show_usage(); } |