summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-08-05 00:31:36 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-08-05 00:31:36 +0200
commit7a02982725ea069edf61b5235a91050e4ba8cc91 (patch)
treebde07509d19eb632242e74f9b19d40ce420c7e17 /sys-fs/lvm2
parentsys-fs/lvm2: bump to 2.02.181 (diff)
downloadgentoo-7a02982725ea069edf61b5235a91050e4ba8cc91.tar.gz
gentoo-7a02982725ea069edf61b5235a91050e4ba8cc91.tar.bz2
gentoo-7a02982725ea069edf61b5235a91050e4ba8cc91.zip
sys-fs/lvm2: use ewend instead of eend on shutdown
Closes: https://bugs.gentoo.org/601998 Package-Manager: Portage-2.3.44, Repoman-2.3.10
Diffstat (limited to 'sys-fs/lvm2')
-rw-r--r--sys-fs/lvm2/files/lvm.rc-2.02.1726
1 files changed, 4 insertions, 2 deletions
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.172 b/sys-fs/lvm2/files/lvm.rc-2.02.172
index 9e22c2801ff1..deaf08959d37 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.172
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.172
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
_get_lvm_path() {
@@ -125,6 +125,8 @@ then
if [ "$VGS" ]
then
+ local _ending="eend"
+ [ "$RC_RUNLEVEL" = shutdown ] && _ending="ewend"
ebegin " Shutting Down LVs & VGs"
#still echo stderr for debugging
lvm_commands="#!${lvm_path}\n"
@@ -134,7 +136,7 @@ then
lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n"
# Order of this is important, have to work around dash and LVM readline
printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
- eend $? "Failed (possibly some LVs still needed for /usr or root)"
+ ${_ending} $? "Failed (possibly some LVs still needed for /usr or root)"
fi
einfo "Finished shutting down the Logical Volume Manager"