projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Announce 1.2.1
[oweals/busybox.git]
/
util-linux
/
pivot_root.c
diff --git
a/util-linux/pivot_root.c
b/util-linux/pivot_root.c
index d7b80d7493a7d50f0c522b4de68790b2eca44ab3..4e67043cd708ab5f69c192f12aa1a952fb9053f2 100644
(file)
--- a/
util-linux/pivot_root.c
+++ b/
util-linux/pivot_root.c
@@
-3,37
+3,26
@@
* pivot_root.c - Change root file system. Based on util-linux 2.10s
*
* busyboxed by Evin Robertson
* 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 or later, see file LICENSE in this tarball for details.
*/
#include <stdlib.h>
#include <stdio.h>
*/
#include <stdlib.h>
#include <stdio.h>
-#include <sys/syscall.h>
-#include <linux/unistd.h>
+#include <errno.h>
#include "busybox.h"
#include "busybox.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)
-
+extern int pivot_root(const char * new_root,const char * put_old);
int pivot_root_main(int argc, char **argv)
{
if (argc != 3)
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;
}
return EXIT_SUCCESS;
}
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/