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 7330713877A for ; Fri, 5 Sep 2014 16:09:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CCD0E0A9F; Fri, 5 Sep 2014 16:09:54 +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 0AB43E0AA0 for ; Fri, 5 Sep 2014 16:09:53 +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 A45E1340042 for ; Fri, 5 Sep 2014 16:09:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6188B4CA1 for ; Fri, 5 Sep 2014 16:09:51 +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: <1403565074.9385ede320e2b9cb6f6c86fa934516a03cf2ac37.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: 9385ede320e2b9cb6f6c86fa934516a03cf2ac37 X-VCS-Branch: aufs Date: Fri, 5 Sep 2014 16:09:51 +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: 3a966262-1e49-4d30-8e2b-f0d2b6bab9ca X-Archives-Hash: 912cd73aded7d720f0a145a8b8ebaf95 commit: 9385ede320e2b9cb6f6c86fa934516a03cf2ac37 Author: Fernando Reyes (likewhoa) missionaccomplish com> AuthorDate: Thu May 29 02:40:18 2014 +0000 Commit: Richard Farina gentoo org> CommitDate: Mon Jun 23 23:11:14 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9385ede3 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 dd3af37..bf4124f 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