Replace debug patch with simple patch to add trivial support for -i option to mount/umount

3 files changed, 30 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e410ab8..942661c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org>
+  +patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff,
+  -patches/busybox/1.7.4/1.7.4-simplify-path-debug.diff:
+  Replace debug patch with simple patch to add trivial support for -i option
+  to mount/umount
+
   13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
   Add suid,dev to unionfs mount opts
 
diff --git a/patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff b/patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff
new file mode 100644
index 00000000..1c4029ef
--- /dev/null
+++ b/patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff
@@ -0,0 +1,24 @@
+diff -ru 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 21:12:06.000000000 -0600
+@@ -1554,7 +1554,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
+diff -ru busybox-1.7.4.orig/util-linux/umount.c busybox-1.7.4/util-linux/umount.c
+--- busybox-1.7.4.orig/util-linux/umount.c	2007-09-03 06:48:56.000000000 -0500
++++ busybox-1.7.4/util-linux/umount.c	2008-11-13 16:13:03.000000000 -0600
+@@ -12,7 +12,7 @@
+ #include <getopt.h>
+ #include "libbb.h"
+ 
+-#define OPTION_STRING		"flDnravdt:"
++#define OPTION_STRING		"flDnravdt:i"
+ #define OPT_FORCE			1
+ #define OPT_LAZY			2
+ #define OPT_DONTFREELOOP	4
diff --git a/patches/busybox/1.7.4/1.7.4-simplify-path-debug.diff b/patches/busybox/1.7.4/1.7.4-simplify-path-debug.diff
deleted file mode 100644
index f804523f..00000000
--- a/patches/busybox/1.7.4/1.7.4-simplify-path-debug.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-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/libbb/simplify_path.c	2008-11-13 14:58:24.000000000 -0600
-@@ -13,6 +13,8 @@
- {
- 	char *s, *start, *p;
- 
-+	printf("bb_simplify_path(): path='%s'\n", path);
-+
- 	if (path[0] == '/')
- 		start = xstrdup(path);
- 	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
-diff -ur busybox-1.7.4.orig/util-linux/umount.c busybox-1.7.4/util-linux/umount.c
---- busybox-1.7.4.orig/util-linux/umount.c	2007-09-03 06:48:56.000000000 -0500
-+++ busybox-1.7.4/util-linux/umount.c	2008-11-13 16:13:03.000000000 -0600
-@@ -12,7 +12,7 @@
- #include <getopt.h>
- #include "libbb.h"
- 
--#define OPTION_STRING		"flDnravdt:"
-+#define OPTION_STRING		"flDnravdt:i"
- #define OPT_FORCE			1
- #define OPT_LAZY			2
- #define OPT_DONTFREELOOP	4