Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/chroot.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/chroot.c (modified) (3 diffs)

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

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -12 +12 @@
 #include "libbb.h"
 
-int chroot_main(int argc, char **argv);
-int chroot_main(int argc, char **argv)
+int chroot_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chroot_main(int argc UNUSED_PARAM, char **argv)
 {
-    if (argc < 2) {
+    ++argv;
+    if (!*argv)
         bb_show_usage();
-    }
-
-    ++argv;
-    if (chroot(*argv)) {
-        bb_perror_msg_and_die("cannot change root directory to %s", *argv);
-    }
+    xchroot(*argv);
     xchdir("/");
 
     ++argv;
-    if (argc == 2) {
+    if (!*argv) { /* no 2nd param (PROG), use shell */
         argv -= 2;
         argv[0] = getenv("SHELL");
@@ -35 +31 @@
     }
 
-    BB_EXECVP(*argv, argv);
-    bb_perror_msg_and_die("cannot execute %s", *argv);
+    BB_EXECVP_or_die(argv);
 }