From 9f076e1e68e1ef153eadef297a5e632f84e2fd9c Mon Sep 17 00:00:00 2001 From: agaffney Date: Thu, 13 Nov 2008 16:15:24 -0600 Subject: [PATCH] Change typo in unionfs-fuse mount opt and add -i support to umount --- ChangeLog | 4 ++++ defaults/initrd.scripts | 2 +- patches/busybox/1.7.4/1.7.4-simplify-path-debug.diff | 12 ++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ec9a330..9594621 100644 --- 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 defaults/initrd.scripts, + patches/busybox/1.7.4/1.7.4-simplify-path-debug.diff: + Change typo in unionfs-fuse mount opt and add -i support to umount + 13 Nov 2008; Andrew Gaffney arch/alpha/busy-config, arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config, arch/parisc64/busy-config, arch/ppc/busy-config, arch/ppc64/busy-config, diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 5165732..428e912 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1011,7 +1011,7 @@ setup_unionfs() { 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} + unionfs -o allow_other,allow_root,cow,noinitgroups ${rw_dir}=RW:${ro_dir} ${UNION} ret=$? if [ "${ret}" -ne 0 ] then 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 index 58fdd46..f804523 100644 --- 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 @@ -36,3 +36,15 @@ diff -ur busybox-1.7.4.orig/util-linux/mount.c busybox-1.7.4/util-linux/mount.c 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 + #include "libbb.h" + +-#define OPTION_STRING "flDnravdt:" ++#define OPTION_STRING "flDnravdt:i" + #define OPT_FORCE 1 + #define OPT_LAZY 2 + #define OPT_DONTFREELOOP 4 -- 2.26.2