Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/util-linux/pivot_root.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/util-linux/pivot_root.c (modified) (1 diff)

branches/2.2.5/mindi-busybox/util-linux/pivot_root.c

@@ -7 +7 @@
  *     regardless of the kernel being used.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include "busybox.h"
+#include "libbb.h"
 
 extern int pivot_root(const char * new_root,const char * put_old);
 
+int pivot_root_main(int argc, char **argv);
 int pivot_root_main(int argc, char **argv)
 {
-    if (argc != 3)
-    bb_show_usage();
+    if (argc != 3)
+        bb_show_usage();
 
-    if (pivot_root(argv[1],argv[2]) < 0)
-        bb_perror_msg_and_die("pivot_root");
+    if (pivot_root(argv[1], argv[2]) < 0) {
+        /* prints "pivot_root: <strerror text>" */
+        bb_perror_nomsg_and_die();
+    }
 
-    return EXIT_SUCCESS;
-
+    return EXIT_SUCCESS;
 }