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 232EA13888F for ; Thu, 8 Oct 2015 18:20:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 898D4E07FE; Thu, 8 Oct 2015 18:20: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 2F64CE07FE for ; Thu, 8 Oct 2015 18:20:56 +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 13782341A56 for ; Thu, 8 Oct 2015 18:20:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D1E7C49 for ; Thu, 8 Oct 2015 18:20:50 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1444328414.d5116cc697c9eb275ab8497939ab41504e5ce578.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/localmount.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: d5116cc697c9eb275ab8497939ab41504e5ce578 X-VCS-Branch: master Date: Thu, 8 Oct 2015 18:20:50 +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: 42098448-24e9-47ae-a2a1-6a6d075b888a X-Archives-Hash: 7e58761c7e569658988c3766efc30bbb commit: d5116cc697c9eb275ab8497939ab41504e5ce578 Author: William Hubbs gmail com> AuthorDate: Thu Oct 8 18:20:14 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Oct 8 18:20:14 2015 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d5116cc6 localmount: white space cleanup init.d/localmount.in | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/init.d/localmount.in b/init.d/localmount.in index dde94af..1812089 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -74,22 +74,21 @@ stop() local aufs_branch aufs_mount_point aufs_si_id aufs_br_id branches for aufs_si_dir in /sys/fs/aufs/si*; do - if [ -d "${aufs_si_dir}" ]; then - aufs_si_id="si=${aufs_si_dir#/sys/fs/aufs/si_}" - aufs_mount_point="$(mountinfo -o ${aufs_si_id})" - branches="$aufs_si_dir/br[0-9] $aufs_si_dir/br[0-9][0-9] $aufs_si_dir/br[0-9][0-9][0-9]" - for x in $branches; do - [ -e "${x}" ] || continue - aufs_branch=$(sed 's/=.*//g' $x) - eindent - if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then - ewarn "Failed to remove branch $aufs_branch from aufs \ - $aufs_mount_point" - fi - eoutdent - sync - done - fi + [ -d "${aufs_si_dir}" ] || continue + aufs_si_id="si=${aufs_si_dir#/sys/fs/aufs/si_}" + aufs_mount_point="$(mountinfo -o ${aufs_si_id})" + branches="$aufs_si_dir/br[0-9] $aufs_si_dir/br[0-9][0-9] $aufs_si_dir/br[0-9][0-9][0-9]" + for x in $branches; do + [ -e "${x}" ] || continue + aufs_branch=$(sed 's/=.*//g' $x) + eindent + if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then + ewarn "Failed to remove branch $aufs_branch from aufs \ + $aufs_mount_point" + fi + eoutdent + sync + done done fi