Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:aufs commit in: defaults/
Date: Fri, 05 Sep 2014 16:09:58
Message-Id: 1403565075.fb87499d4a6ac506c9bb5af2f51461c860a05111.zerochaos@gentoo
1 commit: fb87499d4a6ac506c9bb5af2f51461c860a05111
2 Author: Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
3 AuthorDate: Fri May 30 02:06:42 2014 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 23 23:11:15 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=fb87499d
7
8 Output cleaning
9
10 ---
11 defaults/initrd.scripts | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14 diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
15 index 2fdfb4b..17777c9 100644
16 --- a/defaults/initrd.scripts
17 +++ b/defaults/initrd.scripts
18 @@ -335,7 +335,7 @@ setup_aufs() {
19 else
20 CHANGESDEV=${AUFS}
21 good_msg "mounting ${CHANGESDEV} to ${MEMORY} for aufs support"
22 - mount -t auto ${CHANGESDEV} ${CHANGESMNT}
23 + mount -t auto ${CHANGESDEV} ${CHANGESMNT} &>/dev/null
24 ret=$?
25 if [ "${ret}" -ne 0 ]
26 then
27 @@ -383,7 +383,7 @@ setup_aufs() {
28 # empty or we were not able to mount the storage device
29 if [ "${CDROOT}" -eq '1' -a ! -f ${CHANGESMNT}/${AUFS_CHANGESFILE} ]
30 then
31 - umount ${MEMORY}
32 + umount ${MEMORY} &>/dev/null
33 bad_msg "failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}"
34 bad_msg "create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs"
35 bad_msg "falling back to ramdisk based aufs for safety"