From 692db1a447cf167ffc83653e663d2e95e4c5e2b7 Mon Sep 17 00:00:00 2001
From: agaffney <agaffney@kagome.(none)>
Date: Thu, 13 Nov 2008 16:27:05 -0600
Subject: [PATCH] Remove allow_root mount opt, since it conflicts with
 allow_other

---
 ChangeLog               | 3 +++
 defaults/initrd.scripts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9594621..13661b8 100644
--- 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 428e912..066c2e9 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_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
-- 
2.26.2