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 2218B1397D4 for ; Tue, 11 Aug 2015 18:38:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A33114232; Tue, 11 Aug 2015 18:38:05 +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 A6A1514234 for ; Tue, 11 Aug 2015 18:37:59 +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 7802C340DAE for ; Tue, 11 Aug 2015 18:37:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBF6E162 for ; Tue, 11 Aug 2015 18:37:53 +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: <1439317276.160c3b5d7a5f705fbb838042ca9bdba376a7f984.zerochaos@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.defaults defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 160c3b5d7a5f705fbb838042ca9bdba376a7f984 X-VCS-Branch: master Date: Tue, 11 Aug 2015 18:37:53 +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: eefc3948-d0e0-4f3b-93d2-9e4aab61390c X-Archives-Hash: cc64c5be2d57c3edc2811076d06758f7 commit: 160c3b5d7a5f705fbb838042ca9bdba376a7f984 Author: Fernando Reyes (likewhoa) missionaccomplish com> AuthorDate: Sun Aug 17 00:18:36 2014 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Aug 11 18:21:16 2015 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=160c3b5d restructure no_umounts from being set in /etc/rc.conf to /etc/conf.d/localmount defaults/initrd.defaults | 2 +- defaults/initrd.scripts | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults index f2cb42a..f6fd564 100755 --- a/defaults/initrd.defaults +++ b/defaults/initrd.defaults @@ -60,7 +60,7 @@ KSUFF='.ko' REAL_ROOT='' CONSOLE='/dev/console' NEW_ROOT='/newroot' -RC_NO_UMOUNTS='/newroot|/mnt/aufs-dev|/mnt/aufs-rw-branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino' +no_umounts='/newroot|/mnt/aufs-dev|/mnt/aufs-rw-branch|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino' CDROOT='0' CDROOT_DEV='' CDROOT_TYPE='auto' diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index d168b94..8edaea4 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -323,13 +323,12 @@ union_mod() { union_insert_dir "$aufs_union" "$aufs_union"/mnt/modules/"$mod" } -# Implements RC_NO_UMOUNTS variable into $CHROOT/etc/rc.conf for a cleaner shutdown process -# This should really go into /etc/init.d/localmounts but until then we manually set this here +# Implements no_umounts variable into $CHROOT/etc/conf.d/localmount for a cleaner shutdown process conf_rc_no_umounts() { local conf nomount fnd - conf=$CHROOT/etc/rc.conf fnd=0 + conf=$CHROOT/etc/conf.d/localmount fnd=0 - if nomount=$(grep -n '^[[:blank:]]*RC_NO_UMOUNTS=' $conf); then + if nomount=$(grep -n '^[[:blank:]]*no_umounts=' $conf); then local i n data cmd IFS IFS=' ' @@ -341,20 +340,20 @@ conf_rc_no_umounts() { data=${i#*=} case $data in - "\"$RC_NO_UMOUNTS\""|"'$RC_NO_UMOUNTS'") fnd=1;; + "\"$no_umounts\""|"'$no_umounts'") fnd=1;; *) cmd="$cmd$n d;" esac done if [ -n "$cmd" ]; then sed -i "${cmd%;}" $conf - test_success "Unable to edit rc.conf" + test_success "Unable to edit /etc/conf.d/localmount" fi fi if [ 0 -eq "$fnd" ]; then - printf 'RC_NO_UMOUNTS="%s"\n' "$RC_NO_UMOUNTS" >> $conf - test_success "Unable to write to rc.conf" + printf 'no_umounts="%s"\n' "$no_umounts" >> $conf + test_success "Unable to write to /etc/conf.d/localmount" fi }