diff options
| author | Ian Stakenvicius <axs@gentoo.org> | 2015-10-08 12:49:09 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2015-10-08 12:49:09 -0500 |
| commit | b86d170037197d7bdcda57c7d4c09c17bda97f31 (patch) | |
| tree | 8f6a002bf025f390f1c0e506bdce7346e8311545 /init.d/localmount.in | |
| parent | 6fa0d6318bcd5c98548cff2ff840bca116892ca5 (diff) | |
localmount: clean up handling of aufs branches
X-Gentoo-Bug: 560008
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=560008
Diffstat (limited to 'init.d/localmount.in')
| -rw-r--r-- | init.d/localmount.in | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/init.d/localmount.in b/init.d/localmount.in index 29e73486..dde94af0 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -72,21 +72,24 @@ stop() sync fi - local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id - for aufs_si_dir in /sys/fs/aufs/*; do - aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/} - aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')" - aufs_mount_point="$(mountinfo -o ${aufs_si_id})" - for x in $aufs_si_dir/br[0-9][0-9][0-9]; do - 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 \ + 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 + eoutdent + sync + done + fi done fi |