From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-827916-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 35C541397D5
for <garchives@archives.gentoo.org>; Tue, 11 Aug 2015 18:37:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B4AE4E087C;
Tue, 11 Aug 2015 18:37:56 +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 1587BE087C
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Aug 2015 18:37:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D8B30340D30
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Aug 2015 18:37:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 35C6C148
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Aug 2015 18:37:52 +0000 (UTC)
From: "Richard Farina" <zerochaos@gentoo.org>
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" <zerochaos@gentoo.org>
Message-ID: <1439317275.a1b88b49e6139cf7f0ac465430e3370773ab6017.zerochaos@gentoo>
Subject: [gentoo-commits] proj/genkernel:master 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: a1b88b49e6139cf7f0ac465430e3370773ab6017
X-VCS-Branch: master
Date: Tue, 11 Aug 2015 18:37:52 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 29b1c150-6e19-4bc9-838d-d430c2edf087
X-Archives-Hash: 0e87bb1c5a71bac1e47997ed5b6e5212
commit: a1b88b49e6139cf7f0ac465430e3370773ab6017
Author: Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Thu May 29 02:40:18 2014 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 18:21:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a1b88b49
This fixes /etc/fstab from not working while in setup_aufs function and instead
includes it in the union path.
defaults/initrd.scripts | 1 -
defaults/linuxrc | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 68c0ef7..c76abb5 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1380,7 +1380,6 @@ setup_squashfs_aufs() {
[ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}"
[ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}"
- echo "aufs / aufs defaults 0 0" > "${NEW_ROOT}"/etc/fstab
for i in "${overlay}" "${static}"; do mount --move "${i}" "${NEW_ROOT}${i}"; done
# have handy /mnt/cdrom (CDROOT_PATH) as well
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6d942a1..d5b424c 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -820,6 +820,10 @@ memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) &&
"/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|"\
"/.unions/memory|/.unions/memory/xino\"">> "${UNION}"/etc/rc.conf
+ # Fstab change for aufs
+ test ! $(grep aufs "${UNION}"/etc/fstab) &&
+ echo "aufs / aufs defaults 0 0" > "${UNION}"/etc/fstab
+
warn_msg "Adding all modules in $MODULESD/modules/"
if [ -z "${MODULESD}" ]
then