vi: fix [end] key handling

[oweals/busybox.git] / util-linux / pivot_root.c

diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 92fe4aeabe2a4e1479384b0396d0623161280806..83f01fabde7d4d4bc6cbb891447a1e1bc25eb028 100644 (file)
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -3,37 +3,32 @@
  * pivot_root.c - Change root file system.  Based on util-linux 2.10s
  *
  * busyboxed by Evin Robertson
+ * pivot_root syscall stubbed by Erik Andersen, so it will compile
+ *     regardless of the kernel being used.
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-#include "busybox.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/syscall.h>
-#include <linux/unistd.h>
 
-#ifndef __NR_pivot_root
-#error Sorry, but this kernel does not support the pivot_root syscall
-#endif
+//usage:#define pivot_root_trivial_usage
+//usage:       "NEW_ROOT PUT_OLD"
+//usage:#define pivot_root_full_usage "\n\n"
+//usage:       "Move the current root file system to PUT_OLD and make NEW_ROOT\n"
+//usage:       "the new root file system"
 
-static _syscall2(int,pivot_root,const char *,new_root,const char *,put_old)
+#include "libbb.h"
 
+extern int pivot_root(const char * new_root,const char * put_old);
 
+int pivot_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int pivot_root_main(int argc, char **argv)
 {
-    if (argc != 3)
-        usage(pivot_root_usage);
-
-    if (pivot_root(argv[1],argv[2]) < 0)
-        perror_msg_and_die("pivot_root");
+       if (argc != 3)
+               bb_show_usage();
 
-    return EXIT_SUCCESS;
+       if (pivot_root(argv[1], argv[2]) < 0) {
+               /* prints "pivot_root: <strerror text>" */
+               bb_perror_nomsg_and_die();
+       }
 
+       return EXIT_SUCCESS;
 }
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/