Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/chroot.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/chroot.c (modified) (2 diffs)

branches/3.2/mindi-busybox/coreutils/chroot.c

@@ -10 +10 @@
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
+//usage:#define chroot_trivial_usage
+//usage:       "NEWROOT [PROG ARGS]"
+//usage:#define chroot_full_usage "\n\n"
+//usage:       "Run PROG with root directory set to NEWROOT"
+//usage:
+//usage:#define chroot_example_usage
+//usage:       "$ ls -l /bin/ls\n"
+//usage:       "lrwxrwxrwx    1 root     root          12 Apr 13 00:46 /bin/ls -> /BusyBox\n"
+//usage:       "# mount /dev/hdc1 /mnt -t minix\n"
+//usage:       "# chroot /mnt\n"
+//usage:       "# ls -l /bin/ls\n"
+//usage:       "-rwxr-xr-x    1 root     root        40816 Feb  5 07:45 /bin/ls*\n"
+
 #include "libbb.h"
 
@@ -19 +32 @@
         bb_show_usage();
     xchroot(*argv);
-    xchdir("/");
 
     ++argv;
     if (!*argv) { /* no 2nd param (PROG), use shell */
         argv -= 2;
-        argv[0] = getenv("SHELL");
-        if (!argv[0]) {
-            argv[0] = (char *) DEFAULT_SHELL;
-        }
-        argv[1] = (char *) "-i";
+        argv[0] = (char *) get_shell_name();
+        argv[1] = (char *) "-i"; /* GNU coreutils 8.4 compat */
+        /*argv[2] = NULL; - already is */
     }