From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 987A9138C9D for ; Wed, 29 Apr 2015 19:04:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B019E08C2; Wed, 29 Apr 2015 19:04:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8B22E08C1 for ; Wed, 29 Apr 2015 19:04:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6D16340C03 for ; Wed, 29 Apr 2015 19:04:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DCB8D9AC for ; Wed, 29 Apr 2015 19:04:07 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1430328705.de648288f5cc03636396e93b7128969b95101a53.zerochaos@gentoo> Subject: [gentoo-commits] proj/genkernel:aufs commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts defaults/linuxrc X-VCS-Directories: defaults/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: de648288f5cc03636396e93b7128969b95101a53 X-VCS-Branch: aufs Date: Wed, 29 Apr 2015 19:04:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f6f6b992-d044-4e11-812b-666d7dfb24eb X-Archives-Hash: 32e8718325d85dff02b87269ae8fb4cc commit: de648288f5cc03636396e93b7128969b95101a53 Author: Fernando Reyes (likewhoa) missionaccomplish com> AuthorDate: Fri May 30 02:31:13 2014 +0000 Commit: Richard Farina gentoo org> CommitDate: Wed Apr 29 17:31:45 2015 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=de648288 Wording changes, cosmetic crap defaults/initrd.scripts | 21 +++++++++++---------- defaults/linuxrc | 7 ++++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 0e44e61..fe563fe 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -334,12 +334,12 @@ setup_aufs() { CHANGESDEV=${REAL_ROOT} else CHANGESDEV=${AUFS} - good_msg "mounting ${CHANGESDEV} to ${MEMORY} for aufs support" + good_msg "Mounting ${CHANGESDEV} to ${MEMORY} for aufs support" mount -t auto ${CHANGESDEV} ${CHANGESMNT} &>/dev/null ret=$? if [ "${ret}" -ne 0 ] then - bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs" + bad_msg "Mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs" unset AUFS fi fi @@ -359,15 +359,15 @@ setup_aufs() { then if [ ${nbpass} -eq 0 ] then - bad_msg "mounting of changes file failed, Running e2fsck" + bad_msg "Mounting of changes file failed, Running e2fsck" e2fsck ${CHANGESMNT}/${AUFS_CHANGESFILE} nbpass=$((${nbpass} + 1)) else - bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs" + bad_msg "Mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs" bad_msg "your ${AUFS_CHANGESFILE} might be messed up, and I couldn't fix it" bad_msg "moving ${AUFS_CHANGESFILE} to ${AUFS_CHANGESFILE}.bad" mv ${CHANGESMNT}/${AUFS_CHANGESFILE} ${CHANGESMNT}/${AUFS_CHANGESFILE}.bad - bad_msg "try to fix it yourself with e2fsck later on, sorry for disturbing" + bad_msg "Try to fix it yourself with e2fsck" break fi else @@ -383,19 +383,20 @@ setup_aufs() { # empty or we were not able to mount the storage device if [ "${CDROOT}" -eq '1' -a ! -f ${CHANGESMNT}/${AUFS_CHANGESFILE} ] then + XINO=${MEMORY} umount ${MEMORY} &>/dev/null - bad_msg "failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}" - bad_msg "create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs" - bad_msg "falling back to ramdisk based aufs for safety" + bad_msg "Failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}" + bad_msg "Create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs" + bad_msg "Falling back to ramdisk based aufs for safety" + good_msg "Mounting ramdisk to $MEMORY for aufs support" mount -t tmpfs tmpfs ${MEMORY} - XINO=${MEMORY} else XINO=${MEMORY}/xino mkdir -p ${XINO} mount -t tmpfs tmpfs ${XINO} fi else - good_msg "Mounting ramdisk to $MEMORY for aufs support..." + good_msg "Mounting ramdisk to $MEMORY for aufs support" mount -t tmpfs tmpfs ${MEMORY} XINO=${MEMORY} fi diff --git a/defaults/linuxrc b/defaults/linuxrc index 894ec45..009b4c4 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -758,9 +758,10 @@ then do_rundebugshell } else - good_msg 'Mounting squashfs & aufs filesystems' + good_msg 'Mounting squashfs filesystem' + setup_squashfs_aufs - test_success 'Mount filesystem' + test_success 'Mount aufs filesystem' fi FS_LOCATION='mnt/livecd' elif [ "${LOOPTYPE}" = 'gcloop' ] @@ -1027,7 +1028,7 @@ then str="${str} ${i}" done warn_msg "${str}are mounted in ram" - warn_msg "consider saving important files elsewhere..." + warn_msg "consider saving important files elsewhere" read -t 3 UNUSEDVAL for i in ${CDROOT_PATH} ${overlay} ${static}; do mount --move ${NEW_ROOT}${i} ${CHROOT}${i}