mdev: fix subsystem passing (new kernels broke it again) - bugs 639, 721.

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

diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index d34dcd7cc727c862d39a16a65eb3026f7e475d03..28af00cc1530c723ec0e7fd15a5740182fdfb00f 100644 (file)
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -3,44 +3,25 @@
  * 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 GPL version 2, see file LICENSE in this tarball for details.
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/syscall.h>
-#include <linux/unistd.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)
+#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)
-        show_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;
 }
-#endif
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/