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 1110F1397D4 for ; 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 A1B7AE0850; 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 0E5B2E0850 for ; Tue, 11 Aug 2015 18:37:55 +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 C71F1340D15 for ; 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 488F114C for ; Tue, 11 Aug 2015 18:37:52 +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: <1439317275.5f8969492c9aafd161a5d146ea7fb87e9d2d4850.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: 5f8969492c9aafd161a5d146ea7fb87e9d2d4850 X-VCS-Branch: master Date: Tue, 11 Aug 2015 18:37:52 +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: 800ae7fe-84e0-4ef4-b859-f26788ccd54b X-Archives-Hash: d637f7fdbde1907253c963794b75c129 commit: 5f8969492c9aafd161a5d146ea7fb87e9d2d4850 Author: Fernando Reyes (likewhoa) missionaccomplish com> AuthorDate: Thu May 29 08:15:13 2014 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Aug 11 18:21:15 2015 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5f896949 Removing --bind on some directories to prevent ${NEW_ROOT} path from existing in favor of --move. Got rid of the no longer required subshell call for aufs ${NEW_ROOT} overlay. defaults/initrd.scripts | 11 ++--------- defaults/linuxrc | 7 ++++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index c76abb5..2fe540b 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1363,10 +1363,9 @@ getdvhoff() { } setup_squashfs_aufs() { - ( # Setup aufs directories and vars - local overlay=/mnt/overlay - local static=/mnt/livecd + overlay=/mnt/overlay + static=/mnt/livecd for i in "${overlay}" "${static}"; do [ ! -d "${i}" ] && mkdir -p "${i}" @@ -1381,12 +1380,6 @@ setup_squashfs_aufs() { [ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}" [ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}" for i in "${overlay}" "${static}"; do mount --move "${i}" "${NEW_ROOT}${i}"; done - - # have handy /mnt/cdrom (CDROOT_PATH) as well - local new_cdroot="${NEW_ROOT}${CDROOT_PATH}" - [ ! -d "${new_cdroot}" ] && mkdir -p "${new_cdroot}" - mount --bind "${CDROOT_PATH}" "${new_cdroot}" - ) } setup_unionfs() { diff --git a/defaults/linuxrc b/defaults/linuxrc index d5b424c..0a91c58 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -995,7 +995,7 @@ then 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} + for i in mnt/gentoo mnt/livecd /mnt/overlay ${CDROOT_PATH} do mkdir -p ${CHROOT}/$i chmod 755 ${CHROOT}/$i @@ -1012,8 +1012,9 @@ then warn_msg "${str}are mounted in ram" warn_msg "consider saving important files elsewhere..." read -t 3 UNUSEDVAL - mount --bind ${NEW_ROOT}${CDROOT_PATH} ${CHROOT}${CDROOT_PATH} - mount --bind ${NEW_ROOT}/mnt/livecd ${CHROOT}/mnt/livecd + for i in ${CDROOT_PATH} ${overlay} ${static}; do + mount --move ${NEW_ROOT}${i} ${CHROOT}${i} + done fi good_msg "Booting (initramfs)"