From 7d834c9bb436edd594ebacc48d2b9ea7d3364dbd Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 22 Aug 2017 11:40:27 +0200 Subject: run-init: if doing dry run, do not require pid==1 Signed-off-by: Denys Vlasenko --- util-linux/switch_root.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index 16abcb634..080b05e45 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(); } -- cgit v1.2.3