Commit b0978efa authored by Natanael Copa's avatar Natanael Copa

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
parent 31e017d6
......@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.19
_ver=${pkgver/_git*/}
pkgrel=0
pkgrel=1
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
arch="all"
......@@ -88,7 +88,7 @@ d83df5513f08f09fa9e7353327701bf7 openrc.logrotate
887eba592d487d6ffe2b42cfcd2813df hwdrivers.initd
41974f5408fd2e92892f891b58f2e49f keymaps.initd
0ece77eff8f163b36f6f0e7a6d422866 modules.initd
9462da81ea18471154c820b81eb0de8e modloop.initd
9e6263773bf3af52e1abf81d8cab9098 modloop.initd
27c22aa4e5cdba499ac9a0b6b9385f7d networking.initd
c1ec888202d868710b5749f7b217d1e3 modloop.confd
bd51c5353d6dbbb34d929bf59097b232 consolefont.initd
......@@ -106,7 +106,7 @@ e23db45e9399dab96d6c922af6c0cd6c243bbcc43756c845b70a9c7222a96313 hostname.initd
6cb4d9ea3ad562bcf2697f61f5a76a10481d23f5dead570f82eff576eaca5236 hwdrivers.initd
32562d39ade4092df8163c2e8cf0b31eeec06aa5713d343e1c487bfa6d9f7c84 keymaps.initd
a145636e84547d76b8a188a94c0a76fcc266cd0f486be6cf24d2d74f03038118 modules.initd
5af33627b2f956f81e272441e3a27206f61d08d0151b009c0cbed280bb50f0b5 modloop.initd
007034b7107a8c5ce0bd7750f906e2b42ff8d336d65123d1f2ce1c8e23ad21ea modloop.initd
66151b5cc199485ddd188528a0f22f081994721f04c15b33df38f41a5d08ea78 networking.initd
a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254 modloop.confd
8a3f663e9ac14f62c3aef4121736a71edd676bdc9dd93c1d411f13a0e7ab4ee6 consolefont.initd
......@@ -124,7 +124,7 @@ a6e2b44dd548a2470971a44b61ddaaec037438050fe3411b4ea3fe5d36e9ad4cf5b5e226f8d4aacb
b51d95df7b692aaea3e14ed009d99b46b82500d505e2eeecb6a20136cee140aea4a7377a65ccc5c51fff64be7a50666be48616d179888eaeff9d35178a7a772b hwdrivers.initd
584ecbbcecb284527d7616790b6e337ace610e4b3cedf2993eca294bfbef54674aeaee3078b6c17d746a0c48b5a64a813c3534136915947e6f62a6fa206cd3ca keymaps.initd
7702e2704e4bcfad7c0736eec4cb0e8b20a685851afb5bd9022c5056ea78b8598a9402bae9644ae3268e2ff1c566e147cbb8d00e143491841682e4125fde2a75 modules.initd
32617e1ee365e53eaa7a9508b89cf50d2a09a685c9e254a6e0b98e297b46a2d5104ab4925ed204db0a948388fe2943e4e3761ac593fdf7a3a7171fde19255158 modloop.initd
44b9e9ed3357563e33a9416bceeab22b729cee635ec29e8ece2307795b884fa167974d14b763dbfb2d2a7f34d21e7b6db36c2e371301ca03021c0260794745f0 modloop.initd
9aeba2c5cae539f16185b82c6e6e84c1b044e838749b92e8994172296d86ec3f1c674d62d54db1e08a8191e513ddb0ab3509f50ccae6cb5d7ba5ff5a5b6abb46 networking.initd
aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689 modloop.confd
c8d52d69692a00862cd55719174d7a260d5149f4951dd71196f5e9cebce3a75420a8815f0fe8b186d00b4d46739dc54542dae01a941605fcb1435f4385e444b7 consolefont.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
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment