aboutsummaryrefslogtreecommitdiff
path: root/util-linux/pivot_root.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-08-05 01:51:12 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-08-05 01:51:12 +0200
commitfdb92359e47eee8ccd57092928cedccb28ce2f11 (patch)
treecaa1adb92b38b8af04a34c8be145b40206e232df /util-linux/pivot_root.c
parent9c49d6e11b54bd0695240119f5f28672173f6300 (diff)
downloadbusybox-w32-fdb92359e47eee8ccd57092928cedccb28ce2f11.tar.gz
busybox-w32-fdb92359e47eee8ccd57092928cedccb28ce2f11.tar.bz2
busybox-w32-fdb92359e47eee8ccd57092928cedccb28ce2f11.zip
pivot_root: make it NOFORK
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/pivot_root.c')
-rw-r--r--util-linux/pivot_root.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 331038057..d6a26b912 100644
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -21,7 +21,7 @@
21//config: Note: This is for initrd in linux 2.4. Under initramfs (introduced 21//config: Note: This is for initrd in linux 2.4. Under initramfs (introduced
22//config: in linux 2.6) use switch_root instead. 22//config: in linux 2.6) use switch_root instead.
23 23
24//applet:IF_PIVOT_ROOT(APPLET(pivot_root, BB_DIR_SBIN, BB_SUID_DROP)) 24//applet:IF_PIVOT_ROOT(APPLET_NOFORK(pivot_root, pivot_root, BB_DIR_SBIN, BB_SUID_DROP, pivot_root))
25 25
26//kbuild:lib-$(CONFIG_PIVOT_ROOT) += pivot_root.o 26//kbuild:lib-$(CONFIG_PIVOT_ROOT) += pivot_root.o
27 27
@@ -33,7 +33,7 @@
33 33
34#include "libbb.h" 34#include "libbb.h"
35 35
36extern int pivot_root(const char * new_root,const char * put_old); 36extern int pivot_root(const char *new_root, const char *put_old);
37 37
38int pivot_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 38int pivot_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
39int pivot_root_main(int argc, char **argv) 39int pivot_root_main(int argc, char **argv)
@@ -41,6 +41,8 @@ int pivot_root_main(int argc, char **argv)
41 if (argc != 3) 41 if (argc != 3)
42 bb_show_usage(); 42 bb_show_usage();
43 43
44 /* NOFORK applet. Hardly matters wrt performance, but code is trivial */
45
44 if (pivot_root(argv[1], argv[2]) < 0) { 46 if (pivot_root(argv[1], argv[2]) < 0) {
45 /* prints "pivot_root: <strerror text>" */ 47 /* prints "pivot_root: <strerror text>" */
46 bb_perror_nomsg_and_die(); 48 bb_perror_nomsg_and_die();