From: agaffney Date: Thu, 13 Nov 2008 22:27:05 +0000 (-0600) Subject: Remove allow_root mount opt, since it conflicts with allow_other X-Git-Tag: v3.4.10.902~18 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=692db1a447cf167ffc83653e663d2e95e4c5e2b7;p=genkernel.git Remove allow_root mount opt, since it conflicts with allow_other --- 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 defaults/initrd.scripts: + Remove allow_root mount opt, since it conflicts with allow_other + 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 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