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 D1AFD13877A for ; Fri, 5 Sep 2014 16:09:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F8C6E0AA0; 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 E2550E0A9F 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 939DF33FEEE 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 4F7704C96 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.1ebd03691dd96f3fe952ada0ecf301e9f731cfa5.zerochaos@gentoo> Subject: [gentoo-commits] proj/genkernel:aufs commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.defaults defaults/initrd.scripts defaults/linuxrc X-VCS-Directories: defaults/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 1ebd03691dd96f3fe952ada0ecf301e9f731cfa5 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: 255b95db-3bdc-4e76-ba91-72e4aa7d2ead X-Archives-Hash: 45896935b2d922d2e785c0c637027731 commit: 1ebd03691dd96f3fe952ada0ecf301e9f731cfa5 Author: Fernando Reyes (likewhoa) missionaccomplish com> AuthorDate: Thu May 29 01:55:05 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=1ebd0369 Cleaner shutdown process preventing aufs related mounts from being umounted along with mnt/{livecd,cdrom} and others. Addition of a variable for aufs changes so that required directory can be create upon successful creation of the livecd image file. --- defaults/initrd.defaults | 3 +++ defaults/initrd.scripts | 1 + defaults/linuxrc | 20 +++++++++++++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults index 3d6fe7e..5245959 100755 --- a/defaults/initrd.defaults +++ b/defaults/initrd.defaults @@ -65,6 +65,9 @@ CDROOT_PATH='/mnt/cdrom' # This is the file that the cdroot will be checked for as a # marker. It must exist RELATIVE to the cdroot. CDROOT_MARKER='/livecd' + +# AUFS variables +AUFS_CHANGES=false AUFS_CHANGESFILE=livecd.aufs LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop' diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index e81e5f2..dd3af37 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -285,6 +285,7 @@ create_changefs() { then good_msg "Creation of ${AUFS_CHANGESFILE}, ${size} Mb on ${CHANGESDEV} successful, formatting it ext2" mke2fs -F ${CHANGESMNT}/${AUFS_CHANGESFILE} &>/dev/null + AUFS_CHANGES=true break else rm -f ${CHANGESMNT}/${AUFS_CHANGESFILE} diff --git a/defaults/linuxrc b/defaults/linuxrc index 8620352..6d942a1 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -811,6 +811,15 @@ then # TODO: remounting all tmpfs as RO seems weird, can we be more specific? sed -e 's|\(.*\s/\s*tmpfs\s*\)defaults\(.*\)|\1defaults,ro\2|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new mv /${UNION}/etc/fstab.new /${UNION}/etc/fstab + + # RC_NO_UMOUNTS variable for a clean shutdown/reboot + test ! $(grep 'RC_NO_UMOUNTS="/newroot|/newroot/mnt/aufs|\ +/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|/.unions/\ +memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) && + echo "RC_NO_UMOUNTS=\"/newroot|/newroot/mnt/aufs|"\ +"/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|"\ +"/.unions/memory|/.unions/memory/xino\"">> "${UNION}"/etc/rc.conf + warn_msg "Adding all modules in $MODULESD/modules/" if [ -z "${MODULESD}" ] then @@ -820,6 +829,10 @@ then mount "${MODULESD}" ${NEW_ROOT}/mnt/modulesd union_insert_modules ${NEW_ROOT}/mnt/modulesd fi + + mkdir -p "${UNION}"/newroot/mnt/aufs + test ${AUFS_CHANGES} && test ! -d "${UNION}"/newroot/mnt/changesdev && + mkdir "${UNION}"/newroot/mnt/changesdev fi # Unpacking additional packages from NFS mount @@ -975,9 +988,10 @@ verbose_kmsg if [ "${USE_AUFS_NORMAL}" -eq '1' ] then - mkdir -p /${CHROOT}/.unions/memory 2>/dev/null - mount -o move /memory /${CHROOT}/.unions/memory || echo '*: Failed to move aufs /memory into the system root!' - for i in mnt/gentoo mnt/livecd + mkdir -p /${CHROOT}/.unions/memory + mount -o move /memory /${CHROOT}/.unions/memory + test_success "Failed to move aufs /memory into the system root" + for i in mnt/gentoo mnt/livecd ${CDROOT_PATH} do mkdir -p ${CHROOT}/$i chmod 755 ${CHROOT}/$i