|
|
@ -1,3 +1,4 @@
|
|
|
|
|
|
|
|
diff -ur busybox-1.7.4.orig/libbb/simplify_path.c busybox-1.7.4/libbb/simplify_path.c
|
|
|
|
--- busybox-1.7.4.orig/libbb/simplify_path.c 2007-09-03 06:48:42.000000000 -0500
|
|
|
|
--- busybox-1.7.4.orig/libbb/simplify_path.c 2007-09-03 06:48:42.000000000 -0500
|
|
|
|
+++ busybox-1.7.4/libbb/simplify_path.c 2008-11-13 14:58:24.000000000 -0600
|
|
|
|
+++ busybox-1.7.4/libbb/simplify_path.c 2008-11-13 14:58:24.000000000 -0600
|
|
|
|
@@ -13,6 +13,8 @@
|
|
|
|
@@ -13,6 +13,8 @@
|
|
|
@ -9,3 +10,29 @@
|
|
|
|
if (path[0] == '/')
|
|
|
|
if (path[0] == '/')
|
|
|
|
start = xstrdup(path);
|
|
|
|
start = xstrdup(path);
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
|
|
|
|
diff -ur busybox-1.7.4.orig/util-linux/mount.c busybox-1.7.4/util-linux/mount.c
|
|
|
|
|
|
|
|
--- busybox-1.7.4.orig/util-linux/mount.c 2007-09-03 06:48:56.000000000 -0500
|
|
|
|
|
|
|
|
+++ busybox-1.7.4/util-linux/mount.c 2008-11-13 15:29:59.000000000 -0600
|
|
|
|
|
|
|
|
@@ -1541,6 +1541,13 @@
|
|
|
|
|
|
|
|
SKIP_DESKTOP(const int nonroot = 0;)
|
|
|
|
|
|
|
|
USE_DESKTOP( int nonroot = (getuid() != 0);)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ // Dump the commandline args
|
|
|
|
|
|
|
|
+ printf("'mount' called with the following args:\n");
|
|
|
|
|
|
|
|
+ int z = 0;
|
|
|
|
|
|
|
|
+ for(z=0;z<argc;z++) {
|
|
|
|
|
|
|
|
+ printf(" %s\n", argv[z]);
|
|
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
/* parse long options, like --bind and --move. Note that -o option
|
|
|
|
|
|
|
|
* and --option are synonymous. Yes, this means --remount,rw works. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1554,7 +1561,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Parse remaining options
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- opt = getopt32(argv, "o:t:rwanfvs", &opt_o, &fstype);
|
|
|
|
|
|
|
|
+ opt = getopt32(argv, "o:t:rwanfvsi", &opt_o, &fstype);
|
|
|
|
|
|
|
|
if (opt & 0x1) append_mount_options(&cmdopts, opt_o); // -o
|
|
|
|
|
|
|
|
//if (opt & 0x2) // -t
|
|
|
|
|
|
|
|
if (opt & 0x4) append_mount_options(&cmdopts, "ro"); // -r
|
|
|
|