commit: 7a02982725ea069edf61b5235a91050e4ba8cc91 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat Aug 4 22:31:36 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat Aug 4 22:31:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a029827
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 sys-fs/lvm2/files/lvm.rc-2.02.172 | 6 ++++-- 1 file 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 9e22c2801ff..deaf08959d3 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"
