* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2018-08-04 22:34 Thomas Deutschmann
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Deutschmann @ 2018-08-04 22:34 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2018-08-05 1:11 Thomas Deutschmann
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Deutschmann @ 2018-08-05 1:11 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2019-02-27 5:35 Aaron Bauman
0 siblings, 0 replies; 12+ messages in thread
From: Aaron Bauman @ 2019-02-27 5:35 UTC (permalink / raw
To: gentoo-commits
commit: 6199f84b1cf1fb681c23b9168cf4cf53f1b4ccee
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 12 16:37:57 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 05:35:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6199f84b
sys-fs/lvm2: remove unused patch/files
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
sys-fs/lvm2/files/clvmd.confd-2.02.39 | 9 --
sys-fs/lvm2/files/clvmd.rc-2.02.39 | 145 ---------------------
.../lvm2-2.02.129-dynamic-static-ldflags.patch | 59 ---------
3 files changed, 213 deletions(-)
diff --git a/sys-fs/lvm2/files/clvmd.confd-2.02.39 b/sys-fs/lvm2/files/clvmd.confd-2.02.39
deleted file mode 100644
index 57821709f5f..00000000000
--- a/sys-fs/lvm2/files/clvmd.confd-2.02.39
+++ /dev/null
@@ -1,9 +0,0 @@
-# CLVMD_CLUSTER_TIMEOUT -- amount of time to wait for cluster quorum.
-
-CLVMD_CLUSTER_TIMEOUT=30
-
-
-# CLVMD_NODES_TIMEOUT -- amount of time to wait for the other nodes to
-# join the cluster.
-
-CLVMD_NODES_TIMEOUT=60
diff --git a/sys-fs/lvm2/files/clvmd.rc-2.02.39 b/sys-fs/lvm2/files/clvmd.rc-2.02.39
deleted file mode 100644
index efadd892ee9..00000000000
--- a/sys-fs/lvm2/files/clvmd.rc-2.02.39
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
-
-[ -z "$CLVMD_CLUSTER_TIMEOUT" ] && CLVMD_CLUSTER_TIMEOUT=30
-[ -n "$CLVMD_NODES_TIMEOUT" ] || CLVMD_NODES_TIMEOUT=60
-
-VGCHANGE="/sbin/vgchange"
-VGSCAN="/sbin/vgscan"
-VGDISPLAY="/sbin/vgdisplay"
-CLVMD_PIDFILE="/var/run/clvmd.pid"
-
-depend() {
- use net dns logger dmeventd
- want cman corosync openais
-}
-
-load_modules() {
- local module modules
- modules=$1
-
- for module in ${modules}; do
- ebegin "Loading ${module} kernel module"
- modprobe ${module}
- eend $? "Failed to load ${module} kernel module"
- done
-}
-
-unload_modules() {
- local module modules
- modules=$1
-
- for module in ${modules}; do
- ebegin "Unloading ${module} kernel module"
- modprobe -r ${module}
- eend $? "Failed to unload ${module} kernel module"
- done
-}
-
-umount_gfs_filesystems() {
- local sig retry
- local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-
- if [ -n "${remaining}" ]
- then
- sig=
- retry=3
- while [ -n "${remaining}" -a "${retry}" -gt 0 ]
- do
- if [ "${retry}" -lt 3 ]
- then
- ebegin "Unmounting GFS filesystems (retry)"
- umount ${remaining} &>/dev/null
- eend $? "Failed to unmount GFS filesystems this retry"
- else
- ebegin "Unmounting GFS filesystems"
- umount ${remaining} &>/dev/null
- eend $? "Failed to unmount GFS filesystems"
- fi
- remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
- [ -z "${remaining}" ] && break
- /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
- sleep 5
- retry=$((${retry} -1))
- sig=-9
- done
- fi
-}
-
-
-start_volumes() {
- ebegin "Scanning LVM volumes"
- $VGSCAN > /dev/null 2>&1
- eend $?
-
- ret=$?
- if [ "$ret" -eq 5 ]
- then
- einfo " Waiting for other nodes to join the cluster ($CLVMD_NODES_TIMEOUT seconds)"
- fi
-
- clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
- for vg in $clustervgs; do
- ebegin " Activating Clustered VG: ${vg} "
-
- wait=0
- while [ -n "$($VGCHANGE -a y ${vg} 2>&1 |grep "clvmd not running")" ]; do
- if [ $wait -lt $CLVMD_NODES_TIMEOUT ]; then
- sleep 3
- wait=$(($wait + 3))
- else
- eend 1
- fi
- done
- eend 0
- done
-}
-
-stop_volumes() {
- # Deactivate only clustered volumes
- clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
- for vg in $clustervgs; do
- ebegin " Shutting Down Clustered VG: ${vg} "
- $VGCHANGE -anl ${vg} >/dev/null
- eend $?
- done
-}
-
-
-start() {
- local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/{modules,devices})
-
- if [ -z "${module}" ]; then
- load_modules "dm-mod"
- sleep 1s
- fi
-
- ebegin "Starting clvmd ($CLVMD_CLUSTER_TIMEOUT seconds)"
-
- start-stop-daemon --start --quiet --exec ${CLVMD_BIN} -- -T ${CLVMD_CLUSTER_TIMEOUT}
- eend $?
-
- start_volumes
-}
-
-stop() {
-
- # umount GFS filesystems
- umount_gfs_filesystems
-
- #stop_volumes
-
- ebegin "Stopping clvmd"
- #start-stop-daemon --stop -s TERM --quiet --exec ${CLVMD_BIN} --name clvmd
- killall -TERM ${CLVMD_BIN} >/dev/null
- eend $?
-
- #local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/modules)
-
- #if [[ "$?" -eq 0 && ! -z "${module}" ]]; then
- # unload_modules "dm-mod"
- #fi
-}
diff --git a/sys-fs/lvm2/files/lvm2-2.02.129-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.129-dynamic-static-ldflags.patch
deleted file mode 100644
index efdfb81a8d1..00000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.129-dynamic-static-ldflags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- LVM2.2.02.129/configure.in
-+++ LVM2.2.02.129/configure.in
-@@ -31,6 +31,7 @@
- linux*)
- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
- ELDFLAGS="-Wl,--export-dynamic"
-+ STATIC_LDFLAGS="-Wl,--no-export-dynamic"
- # FIXME Generate list and use --dynamic-list=.dlopen.sym
- CLDWHOLEARCHIVE="-Wl,-whole-archive"
- CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
-@@ -2008,6 +2009,7 @@
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-+AC_SUBST(STATIC_LDFLAGS)
- AC_SUBST(STATIC_LINK)
- AC_SUBST(TESTING)
- AC_SUBST(TESTSUITE_DATA)
---- LVM2.2.02.129/daemons/dmeventd/Makefile.in
-+++ LVM2.2.02.129/daemons/dmeventd/Makefile.in
-@@ -66,7 +66,7 @@
- $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
-
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
- dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
-
- ifeq ("@PKGCONFIG@", "yes")
---- LVM2.2.02.129/make.tmpl.in
-+++ LVM2.2.02.129/make.tmpl.in
-@@ -48,6 +48,7 @@
- # FIXME set this only where it's needed, not globally?
- CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
- LDFLAGS ?= @COPTIMISE_FLAG@ @LDFLAGS@
-+STATIC_LDFLAGS += @STATIC_LDFLAGS@
- CLDFLAGS += @CLDFLAGS@
- ELDFLAGS += @ELDFLAGS@
- LDDEPS += @LDDEPS@
---- LVM2.2.02.129/tools/Makefile.in
-+++ LVM2.2.02.129/tools/Makefile.in
-@@ -129,7 +129,7 @@
- -o $@ dmsetup.o -ldevmapper $(LIBS)
-
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
- -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
-
- all: device-mapper
-@@ -146,7 +146,7 @@
- endif
-
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
-
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2019-04-17 7:26 Robin H. Johnson
0 siblings, 0 replies; 12+ messages in thread
From: Robin H. Johnson @ 2019-04-17 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 965220269a5b04a2aeb7061d8e69b62156bd9373
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 06:17:25 2019 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 07:25:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96522026
sys-fs/lvm2: don't get stuck with root-on-LVM
During system shutdown, init.d/lvm tries to run 'vgchange -a ln' to
close all LVs. It fails with root-on-LVM (or seperate /usr-on-LVM),
because those mountpoints are still in use. As a best-effort, consider
it done after the 'vgchange -a ln' pass. This is similar to localmount's
stop, which does not fail if a filesystem cannot be unmounted.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-fs/lvm2/files/lvm.rc-2.02.183 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.183 b/sys-fs/lvm2/files/lvm.rc-2.02.183
index d431fc72138..ce499a6dd21 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.183
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.183
@@ -138,7 +138,10 @@ stop() {
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)"
+ rc=$?
+ msg="Failed (possibly some LVs still needed for /usr or root)"
+ [ "$RC_RUNLEVEL" = shutdown ] && msg="${msg} [rc=$rc]" && rc=0
+ ${_ending} $rc "${msg}"
fi
einfo "Finished shutting down the Logical Volume Manager"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2020-04-14 18:34 Thomas Deutschmann
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Deutschmann @ 2020-04-14 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 416b070c9234d47c19d09a318643081b0761e02a
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 17:38:40 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 18:34:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416b070c
sys-fs/lvm2: runscript: save complete USE
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-fs/lvm2/files/lvm.rc-2.02.187 | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.187 b/sys-fs/lvm2/files/lvm.rc-2.02.187
index 6b4e3df715f..daafffd5b28 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.187
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.187
@@ -108,10 +108,16 @@ start() {
}
start_post() {
- # Save if we needed lvmetad
+ local _use=
if _use_lvmetad ; then
- service_set_value use lvmetad
+ _use="${_use} lvmetad"
+ fi
+
+ if _use_lvmlockd ; then
+ _use="${_use} lvmlockd"
fi
+
+ service_set_value use "${_use}"
}
stop() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2020-04-14 18:34 Thomas Deutschmann
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Deutschmann @ 2020-04-14 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 3958b1dd77ce75c3d2077acc62b4babc8419a9e6
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 17:40:16 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 18:34:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3958b1dd
sys-fs/lvm2: runscript: unify $lvm_path handling
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-fs/lvm2/files/lvm.rc-2.02.187 | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.187 b/sys-fs/lvm2/files/lvm.rc-2.02.187
index daafffd5b28..1bf8002b9da 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.187
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.187
@@ -71,12 +71,10 @@ start() {
# NOTE: Add needed modules for LVM or RAID, etc
# to /etc/modules.autoload if needed
+
lvm_path="$(_get_lvm_path)"
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "${lvm_path}" ] && break
- done
- if [ ! -x "${lvm_path}" ] ; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
+ if [ -z "${lvm_path}" ] ; then
+ eerror "Failed to find lvm binary in /bin or /sbin!"
return 1
fi
if [ -z "${CDBOOT}" ] ; then
@@ -121,12 +119,9 @@ start_post() {
}
stop() {
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "${lvm_path}" ] && break
- done
-
- if [ ! -x "${lvm_path}" ] ; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
+ lvm_path="$(_get_lvm_path)"
+ if [ -z "${lvm_path}" ] ; then
+ eerror "Failed to find lvm binary in /bin or /sbin!"
return 1
fi
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2020-04-14 18:34 Thomas Deutschmann
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Deutschmann @ 2020-04-14 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 83556863450367f6001774338d77cfca6bb70e8f
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 17:46:32 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 18:34:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83556863
sys-fs/lvm2: runscript: rework stop()
- Don't use LVM script anymore: If one command within script failed,
any following command won't run anymore.
- Be verbose when rc_verbose=yes is set.
- Don't pass VGs to vgchange command. This way, LVM will determine VGs
on its own and we don't risk to hit command limit when system has
many VGs.
Closes: https://bugs.gentoo.org/690404
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-fs/lvm2/files/lvm.rc-2.02.187 | 47 ++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 25 deletions(-)
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.187 b/sys-fs/lvm2/files/lvm.rc-2.02.187
index f9ad753ea82..84e799c32f0 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.187
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.187
@@ -138,39 +138,36 @@ stop() {
fi
# Stop LVM2
- if [ -x /sbin/vgs ] \
- && [ -x /sbin/vgchange ] \
- && [ -x /sbin/lvchange ] \
- && [ -f /etc/lvmtab -o -d /etc/lvm ] \
+ if [ -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"
+ local VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
+ if [ -z "${VGS}" ] ; then
+ # nothing to do for us
+ return 0
+ fi
- VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
+ local has_errors=0 verbose_command eend_cmd="eend"
- if [ -n "${VGS}" ] ; then
- local _ending="eend"
- [ "${RC_RUNLEVEL}" = shutdown ] && _ending="ewend"
+ yesno "${rc_verbose}" && verbose_command=" -v"
- 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
-
- rc=${?}
- msg="Failed (possibly some LVs still needed for /usr or root)"
- [ "${RC_RUNLEVEL}" = shutdown ] && msg="${msg} [rc=${rc}]" && rc=0
- ${_ending} ${rc} "${msg}"
+ local msg="Failed to stop Logical Volume Manager"
+ if [ "${RC_RUNLEVEL}" = shutdown ] ; then
+ # failures on shutdown are non-fatal
+ eend_cmd="ewend"
+ msg="${msg} (possibly some LVs still needed for /usr or root)"
fi
- einfo "Finished shutting down the Logical Volume Manager"
- return 0
+ ebegin "Stopping the Logical Volume Manager"
+
+ ${lvm_path} vgchange${verbose_command} --config "${config}" --sysinit --activate n
+ [ $? -ne 0 ] && has_errors=1
+
+ ${eend_cmd} ${has_errors} "${msg}"
fi
+
+ # at this point make sure we always exit without indicating an error
+ return 0
}
# vim:ts=4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2020-04-14 18:34 Thomas Deutschmann
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Deutschmann @ 2020-04-14 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 1bb133b505d5aade0cc0b6c6e16f1bc3e9a266f7
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 17:42:51 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 18:34:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb133b5
sys-fs/lvm2: runscript: rework start()
- Don't use LVM script anymore: If one command within script failed,
any following command won't run anymore.
- Be verbose when rc_verbose=yes is set.
- Only call pvscan when lvmetad is used.
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-fs/lvm2/files/lvm.rc-2.02.187 | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.187 b/sys-fs/lvm2/files/lvm.rc-2.02.187
index d9c11730cdb..f9ad753ea82 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.187
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.187
@@ -86,24 +86,33 @@ start() {
fi
if [ -d /proc/lvm ] || dm_in_proc ; then
- ebegin "Setting up the Logical Volume Manager"
- #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}pvscan --config '${config}'\n"
+ local has_errors=0 verbose_command
+
+ yesno "${rc_verbose}" && verbose_command=" -v"
+
+ ebegin "Starting the Logical Volume Manager"
+
+ if _use_lvmetad ; then
+ # Extra PV find pass because some devices might not have been available until very recently
+ ${lvm_path} pvscan${verbose_command} --config "${config}" --cache
+ [ $? -ne 0 ] && has_errors=1
+ fi
+
# Now make the nodes
- lvm_commands="${lvm_commands}vgscan --config '${config}' --mknodes\n"
- # And turn them on!
- lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ly\n"
+ ${lvm_path} vgscan${verbose_command} --config "${config}" --mknodes
+ [ $? -ne 0 ] && has_errors=1
+
+ # Enable all VGs
+ ${lvm_path} vgchange${verbose_command} --config "${config}" --sysinit --activate y
+ [ $? -ne 0 ] && has_errors=1
if _use_lvmlockd ; then
# Start lockd VGs as required
- lvm_commands="${lvm_commands}vgchange --config '${config}' --lock-start --lock-opt auto\n"
+ ${lvm_path} vgchange${verbose_command} --config "${config}" --lock-start --lock-opt auto
+ [ $? -ne 0 ] && has_errors=1
fi
- # Order of this is important, have to work around dash and LVM readline
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 >/dev/null
- eend $? "Failed to setup the LVM"
+ eend ${has_errors} "Failed to start the Logical Volume Manager"
fi
fi
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2020-04-14 18:34 Thomas Deutschmann
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Deutschmann @ 2020-04-14 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 499d46aecf548f32a1ea07e1f942ecb3b37edb5e
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 17:41:24 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 18:34:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499d46ae
sys-fs/lvm2: runscript: output msg when we are loading module
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-fs/lvm2/files/lvm.rc-2.02.187 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.187 b/sys-fs/lvm2/files/lvm.rc-2.02.187
index 1bf8002b9da..d9c11730cdb 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.187
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.187
@@ -77,9 +77,12 @@ start() {
eerror "Failed to find lvm binary in /bin or /sbin!"
return 1
fi
+
if [ -z "${CDBOOT}" ] ; then
if [ -e /proc/modules ] && ! dm_in_proc ; then
+ ebegin "Trying to load dm-mod module"
modprobe dm-mod 2>/dev/null
+ eend $?
fi
if [ -d /proc/lvm ] || dm_in_proc ; then
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2020-06-07 4:41 Aaron Bauman
0 siblings, 0 replies; 12+ messages in thread
From: Aaron Bauman @ 2020-06-07 4:41 UTC (permalink / raw
To: gentoo-commits
commit: 8c96911314d1ca1f37387c31cc4a1e180fe36502
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun 6 20:06:29 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jun 7 04:41:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c969113
sys-fs/lvm2: remove unused patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16092
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../lvm2-2.02.92-dynamic-static-ldflags.patch | 63 ----------------------
1 file changed, 63 deletions(-)
diff --git a/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch
deleted file mode 100644
index de2b294ef3e..00000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/configure.in LVM2.2.02.92/configure.in
---- LVM2.2.02.92.orig/configure.in 2012-02-20 11:36:27.000000000 -0800
-+++ LVM2.2.02.92/configure.in 2012-02-20 15:53:40.700124222 -0800
-@@ -32,6 +32,7 @@
- COPTIMISE_FLAG="-O2"
- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
- ELDFLAGS="-Wl,--export-dynamic"
-+ STATIC_LDFLAGS="-Wl,--no-export-dynamic"
- # FIXME Generate list and use --dynamic-list=.dlopen.sym
- CLDWHOLEARCHIVE="-Wl,-whole-archive"
- CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
-@@ -1458,6 +1459,7 @@
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-+AC_SUBST(STATIC_LDFLAGS)
- AC_SUBST(STATIC_LINK)
- AC_SUBST(TESTING)
- AC_SUBST(THIN)
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in LVM2.2.02.92/daemons/dmeventd/Makefile.in
---- LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in 2012-02-20 15:48:04.861683196 -0800
-+++ LVM2.2.02.92/daemons/dmeventd/Makefile.in 2012-02-20 15:52:50.732314588 -0800
-@@ -65,7 +65,7 @@
- $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
-
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
- dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
-
- ifeq ("@PKGCONFIG@", "yes")
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/make.tmpl.in LVM2.2.02.92/make.tmpl.in
---- LVM2.2.02.92.orig/make.tmpl.in 2012-02-20 15:48:05.034685963 -0800
-+++ LVM2.2.02.92/make.tmpl.in 2012-02-20 15:48:58.622550855 -0800
-@@ -38,6 +38,7 @@
- ELDFLAGS += @ELDFLAGS@
- LDDEPS += @LDDEPS@
- LDFLAGS += @LDFLAGS@
-+STATIC_LDFLAGS += @STATIC_LDFLAGS@
- LIB_SUFFIX = @LIB_SUFFIX@
- LVMINTERNAL_LIBS = -llvm-internal $(UDEV_LIBS) $(DL_LIBS)
- DL_LIBS = @DL_LIBS@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/tools/Makefile.in LVM2.2.02.92/tools/Makefile.in
---- LVM2.2.02.92.orig/tools/Makefile.in 2011-11-14 13:30:36.000000000 -0800
-+++ LVM2.2.02.92/tools/Makefile.in 2012-02-20 15:52:25.242901501 -0800
-@@ -126,7 +126,7 @@
- -o $@ dmsetup.o -ldevmapper $(LIBS)
-
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
- -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
-
- all: device-mapper
-@@ -136,7 +136,7 @@
- $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
-
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
-
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2022-10-30 9:28 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2022-10-30 9:28 UTC (permalink / raw
To: gentoo-commits
commit: f0aecec0c9dd7ba72dd36120a8fa026987fbd7f9
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Oct 30 07:59:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:27:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0aecec0
sys-fs/lvm2: remove unused file
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28027
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 b/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
deleted file mode 100644
index 55bbf9c4b63b..000000000000
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/lvmetad.pid"
-command="/sbin/lvmetad"
-command_args="${LVMETAD_OPTS:=-p ${pidfile}}"
-start_stop_daemon_args="--pidfile ${pidfile}"
-
-depend() {
- :
-}
-
-start_pre()
-{
- checkpath --directory /run/lvm || return 1
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/
@ 2023-01-01 18:16 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2023-01-01 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 8574f23cce9261eda81e9366316e53a7f551d7e7
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jan 1 13:45:08 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 18:16:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8574f23c
sys-fs/lvm2: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28913
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-fs/lvm2/files/lvm2-2.03.16-readelf.patch | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/sys-fs/lvm2/files/lvm2-2.03.16-readelf.patch b/sys-fs/lvm2/files/lvm2-2.03.16-readelf.patch
deleted file mode 100644
index b4d60c5825db..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.03.16-readelf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nuar LVM2.2.03.16.orig/libdm/Makefile.in LVM2.2.03.16/libdm/Makefile.in
---- LVM2.2.03.16.orig/libdm/Makefile.in 2022-05-18 09:24:20.000000000 -0700
-+++ LVM2.2.03.16/libdm/Makefile.in 2022-10-27 10:09:29.283631020 -0700
-@@ -59,6 +59,10 @@
-
- PROGS_CFLAGS = $(UDEV_CFLAGS)
-
-+ifeq ($(strip $(READELF)),)
-+READELF := readelf
-+endif
-+
- device-mapper: $(TARGETS)
-
- dm-tools.device-mapper: device-mapper
-@@ -71,8 +75,8 @@
- # also the older symbol is built-in
- .symver_check: $(LIB_SHARED)
- @echo " [CHECK] $<"
-- $(Q) if readelf -Ws $< | grep -q dm_stats_create_region@@; then \
-- SYM=$$(readelf -Ws $< | grep dm_stats_create_region@DM_1_02_106); \
-+ $(Q) if $(READELF) -Ws $< | grep -q dm_stats_create_region@@; then \
-+ SYM=$$( $(READELF) -Ws $< | grep dm_stats_create_region@DM_1_02_106); \
- if test -n "$$SYM"; then touch $@; \
- else echo >&2 "Missing versioned symbols in $<"; false; fi; \
- else touch $@; fi
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-01-01 18:16 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-05 1:11 [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2023-01-01 18:16 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox