| 1 |
commit: 7a02982725ea069edf61b5235a91050e4ba8cc91 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 4 22:31:36 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 4 22:31:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a029827 |
| 7 |
|
| 8 |
sys-fs/lvm2: use ewend instead of eend on shutdown |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/601998 |
| 11 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
| 12 |
|
| 13 |
sys-fs/lvm2/files/lvm.rc-2.02.172 | 6 ++++-- |
| 14 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.172 b/sys-fs/lvm2/files/lvm.rc-2.02.172 |
| 17 |
index 9e22c2801ff..deaf08959d3 100644 |
| 18 |
--- a/sys-fs/lvm2/files/lvm.rc-2.02.172 |
| 19 |
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.172 |
| 20 |
@@ -1,5 +1,5 @@ |
| 21 |
#!/sbin/openrc-run |
| 22 |
-# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
_get_lvm_path() { |
| 27 |
@@ -125,6 +125,8 @@ then |
| 28 |
|
| 29 |
if [ "$VGS" ] |
| 30 |
then |
| 31 |
+ local _ending="eend" |
| 32 |
+ [ "$RC_RUNLEVEL" = shutdown ] && _ending="ewend" |
| 33 |
ebegin " Shutting Down LVs & VGs" |
| 34 |
#still echo stderr for debugging |
| 35 |
lvm_commands="#!${lvm_path}\n" |
| 36 |
@@ -134,7 +136,7 @@ then |
| 37 |
lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n" |
| 38 |
# Order of this is important, have to work around dash and LVM readline |
| 39 |
printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null |
| 40 |
- eend $? "Failed (possibly some LVs still needed for /usr or root)" |
| 41 |
+ ${_ending} $? "Failed (possibly some LVs still needed for /usr or root)" |
| 42 |
fi |
| 43 |
|
| 44 |
einfo "Finished shutting down the Logical Volume Manager" |
Archives