emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run-init: if doing dry run, do not require pid==1

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-22 11:40:27 +02:00
parent 753c4045e4
commit 7d834c9bb4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util-linux/switch_root.c
View File

@ -227,9 +227,12 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv)
xstat("/", &st); xstat("/", &st);
rootdev = st.st_dev; rootdev = st.st_dev;
xstat(".", &st); xstat(".", &st);
if (st.st_dev == rootdev || getpid() != 1) { if (st.st_dev == rootdev) {
// Show usage, it says new root must be a mountpoint // 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(); bb_show_usage();
} }