quick patch - have removed stranges for me

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

diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index e0071014888f525870f8531e4218a496a098909a..85e180c4631cc67c3d1c3d2012ef5e5d50c85ad7 100644 (file)
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -3,27 +3,23 @@
  * 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.
  */
-#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
-
-static _syscall2(int,pivot_root,const char *,new_root,const char *,put_old)
+#include <errno.h>
+#include "busybox.h"
 
+extern int pivot_root(const char * new_root,const char * put_old);
 
 int pivot_root_main(int argc, char **argv)
 {
     if (argc != 3)
-        show_usage();
+        bb_show_usage();
 
-    if (pivot_root(argv[1],argv[2]) < 0)
-        perror_msg_and_die("pivot_root");
+       if (pivot_root(argv[1],argv[2]) < 0)
+               bb_perror_msg_and_die("pivot_root");
 
     return EXIT_SUCCESS;