diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-14 13:20:33 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-14 13:24:07 +0000 |
commit | b0978efa21dbc55969eeb12d2f0f15376cc4f906 (patch) | |
tree | ef0a327ab6851c63cc4a9e0dde23c132afbfc725 /main/openrc/modloop.initd | |
parent | 31e017d6bf778d5fda8cdd089dcd224adeba7268 (diff) | |
download | aports-b0978efa21dbc55969eeb12d2f0f15376cc4f906.tar.bz2 aports-b0978efa21dbc55969eeb12d2f0f15376cc4f906.tar.xz |
main/openrc: only umount the modloop image
Don't umount anything more than the loopback image itself to avoid
problems with:
- udev (fixes #4913)
- apk cache
- setup-bootable -u
Diffstat (limited to 'main/openrc/modloop.initd')
-rw-r--r-- | main/openrc/modloop.initd | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd index fd11d72341..f88d0a5755 100644 --- a/main/openrc/modloop.initd +++ b/main/openrc/modloop.initd @@ -47,13 +47,6 @@ find_backing_file() { cat /sys/block/${dev#/dev/}/loop/backing_file 2>/dev/null } -find_alpine_mnt() { - local img="$(find_backing_file $1)" - if [ -n "$img" ]; then - df -P "$img" | tail -1 | awk '{print $6}' - fi -} - start() { local modloop= mount_opts= modloop_dldir="/lib" init_KOPT @@ -118,7 +111,6 @@ start() { stop() { local rc=0 - alpine_mnt=$(find_alpine_mnt /.modloop) if mountinfo --quiet /.modunisonfs/modules && mountinfo --quiet /lib/modules; then umount /lib/modules umount /.modunisonfs/modules @@ -128,10 +120,5 @@ stop() { umount -d /.modloop eend $? || return 1 fi - if [ -n "$alpine_mnt" ] && mountinfo --quiet $alpine_mnt; then - ebegin "Unmounting $alpine_mnt" - umount $alpine_mnt - eend $? - fi } |