More fixes. Type "auto" should mean unspecified from fstab as well as the

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

diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index d34dcd7cc727c862d39a16a65eb3026f7e475d03..c86e73cc184dbd07f0d8b9b3ab514a3ccf4a875f 100644 (file)
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -3,38 +3,27 @@
  * 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 <stdlib.h>
 #include <stdio.h>
-#include <sys/syscall.h>
-#include <linux/unistd.h>
+#include <errno.h>
 #include "busybox.h"
 
-#ifndef __NR_pivot_root
-#warning This kernel does not support the pivot_root syscall
-#warning The pivot_root application is being stubbed out...
-int pivot_root_main(int argc, char **argv)
-{
-       printf("Please recompile with a kernel supporting the pivot_root syscall.\n");
-       return 0;
-}
-#else
-
-static _syscall2(int,pivot_root,const char *,new_root,const char *,put_old)
-
+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;
 
 }
-#endif
 
 
 /*