Add patch for busybox to add -i option to mount command

diff --git a/ChangeLog b/ChangeLog
index 1192d17d28705de491645f67e4ead6f5ec864cea..c4b139de654a3c33a26bd5ff0ef8a1beb7871c97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
+  +patches/busybox/1.7.4/1.7.4-mount-i-option.diff:
+  Add patch for busybox to add -i option to mount command
+
   13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
   Compile unionfs-fuse statically
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c69218dab1618ae5fb3d7dfbda88ae0184d337e4..516573206aad24a6a6cdc5dae41b4ceb21c505d4 100644 (file)
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1007,6 +1007,8 @@ setup_unionfs() {
                          mount -t tmpfs tmpfs $MEMORY   
 #                 fi    
         
+               mkdir /tmp
+               mkdir -p ${UNION}
                mkdir -p $CHANGES
 #              mount -t unionfs -o dirs=$CHANGES=rw unionfs ${UNION}
                unionfs -o allow_others,allow_root,cow,noinitgroups ${rw_dir}=RW:${ro_dir} ${UNION}

diff --git a/patches/busybox/1.7.4/1.7.4-mount-i-option.diff b/patches/busybox/1.7.4/1.7.4-mount-i-option.diff
new file mode 100644 (file)
index 0000000..9d6fd73
--- /dev/null
+++ b/patches/busybox/1.7.4/1.7.4-mount-i-option.diff
@@ -0,0 +1,11 @@
+--- 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 12:09:53.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