From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
Date: Sun, 5 Aug 2018 01:11:11 +0000 (UTC) [thread overview]
Message-ID: <1533431439.8c7c438aca74983f42d52edb990f0a7e8786ff4c.whissi@gentoo> (raw)
commit: 8c7c438aca74983f42d52edb990f0a7e8786ff4c
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 5 01:10:39 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 5 01:10:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7c438a
sys-fs/lvm2: runscript: fix indentation
Package-Manager: Portage-2.3.44, Repoman-2.3.10
sys-fs/lvm2/files/lvm.rc-2.02.172 | 56 ++++++++++++++++++++-------------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.172 b/sys-fs/lvm2/files/lvm.rc-2.02.172
index deaf08959d3..c3f1f08f399 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.172
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.172
@@ -23,6 +23,7 @@ _need_lvmlockd()
[ ! -x "${lvm_path}" ] && return 1
${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1'
}
+
depend() {
before checkfs fsck
after modules device-mapper
@@ -112,36 +113,37 @@ stop() {
eerror "Cannot find lvm binary in /sbin or /bin!"
return 1
fi
-# Stop LVM2
-if [ -x /sbin/vgs ] && \
- [ -x /sbin/vgchange ] && \
- [ -x /sbin/lvchange ] && \
- [ -f /etc/lvmtab -o -d /etc/lvm ] && \
- [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-then
- einfo "Shutting down the Logical Volume Manager"
- VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
+ # Stop LVM2
+ if [ -x /sbin/vgs ] && \
+ [ -x /sbin/vgchange ] && \
+ [ -x /sbin/lvchange ] && \
+ [ -f /etc/lvmtab -o -d /etc/lvm ] && \
+ [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
+ then
+ einfo "Shutting down the Logical Volume Manager"
- 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"
- # Extra PV find pass because some devices might not have been available until very recently
- lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n"
- # Now make the nodes
- 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
- ${_ending} $? "Failed (possibly some LVs still needed for /usr or root)"
- fi
+ VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
+
+ 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"
+ # Extra PV find pass because some devices might not have been available until very recently
+ lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n"
+ # Now make the nodes
+ 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
+ ${_ending} $? "Failed (possibly some LVs still needed for /usr or root)"
+ fi
- einfo "Finished shutting down the Logical Volume Manager"
- return 0
-fi
+ einfo "Finished shutting down the Logical Volume Manager"
+ return 0
+ fi
}
# vim:ts=4
next reply other threads:[~2018-08-05 1:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-05 1:11 Thomas Deutschmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-01 18:16 [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/ Conrad Kostecki
2022-10-30 9:28 Sam James
2020-06-07 4:41 Aaron Bauman
2020-04-14 18:34 Thomas Deutschmann
2020-04-14 18:34 Thomas Deutschmann
2020-04-14 18:34 Thomas Deutschmann
2020-04-14 18:34 Thomas Deutschmann
2020-04-14 18:34 Thomas Deutschmann
2019-04-17 7:26 Robin H. Johnson
2019-02-27 5:35 Aaron Bauman
2018-08-04 22:34 Thomas Deutschmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1533431439.8c7c438aca74983f42d52edb990f0a7e8786ff4c.whissi@gentoo \
--to=whissi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox