Remove allow_root mount opt, since it conflicts with allow_other

diff --git a/ChangeLog b/ChangeLog
index 9594621af41aaeb9f2f8beb1d2661b8bb65f9f38..13661b8fb405fa0d28313c8b9958923da736bf78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # 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:
+  Remove allow_root mount opt, since it conflicts with allow_other
+
   13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> 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

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 428e912c067a22a94367f5258c4c9ba33f7baf6a..066c2e93a901dde4ac302ee80973c8e9d7be7f9a 100644 (file)
--- 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_other,allow_root,cow,noinitgroups ${rw_dir}=RW:${ro_dir} ${UNION}
+               unionfs -o allow_other,cow,noinitgroups ${rw_dir}=RW:${ro_dir} ${UNION}
                ret=$?
                if [ "${ret}" -ne 0 ]
                then