| 1 |
commit: 965220269a5b04a2aeb7061d8e69b62156bd9373 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 17 06:17:25 2019 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 17 07:25:37 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96522026 |
| 7 |
|
| 8 |
sys-fs/lvm2: don't get stuck with root-on-LVM |
| 9 |
|
| 10 |
During system shutdown, init.d/lvm tries to run 'vgchange -a ln' to |
| 11 |
close all LVs. It fails with root-on-LVM (or seperate /usr-on-LVM), |
| 12 |
because those mountpoints are still in use. As a best-effort, consider |
| 13 |
it done after the 'vgchange -a ln' pass. This is similar to localmount's |
| 14 |
stop, which does not fail if a filesystem cannot be unmounted. |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 17 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 18 |
|
| 19 |
sys-fs/lvm2/files/lvm.rc-2.02.183 | 5 ++++- |
| 20 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.183 b/sys-fs/lvm2/files/lvm.rc-2.02.183 |
| 23 |
index d431fc72138..ce499a6dd21 100644 |
| 24 |
--- a/sys-fs/lvm2/files/lvm.rc-2.02.183 |
| 25 |
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.183 |
| 26 |
@@ -138,7 +138,10 @@ stop() { |
| 27 |
lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n" |
| 28 |
# Order of this is important, have to work around dash and LVM readline |
| 29 |
printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null |
| 30 |
- ${_ending} $? "Failed (possibly some LVs still needed for /usr or root)" |
| 31 |
+ rc=$? |
| 32 |
+ msg="Failed (possibly some LVs still needed for /usr or root)" |
| 33 |
+ [ "$RC_RUNLEVEL" = shutdown ] && msg="${msg} [rc=$rc]" && rc=0 |
| 34 |
+ ${_ending} $rc "${msg}" |
| 35 |
fi |
| 36 |
|
| 37 |
einfo "Finished shutting down the Logical Volume Manager" |
Archives