diff options
| -rw-r--r-- | sys-fs/lvm2/files/lvm.rc-2.03.05 | 132 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.03.09.ebuild | 2 |
2 files changed, 1 insertions, 133 deletions
diff --git a/sys-fs/lvm2/files/lvm.rc-2.03.05 b/sys-fs/lvm2/files/lvm.rc-2.03.05 deleted file mode 100644 index 7b7d90b98269..000000000000 --- a/sys-fs/lvm2/files/lvm.rc-2.03.05 +++ /dev/null @@ -1,132 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -_get_lvm_path() { - local lvm_path= - for lvm_path in /bin/lvm /sbin/lvm ; do - [ -x "$lvm_path" ] && break - done - echo "${lvm_path}" -} - -_need_lvmlockd() -{ - local lvm_path="$(_get_lvm_path)" - [ ! -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 - config /etc/lvm/lvm.conf - local _need= - if service_started; then - _need=$(service_get_value need) - else - if _need_lvmlockd; then - _need="${_need} lvmlockd" - fi - fi - # Make sure you review /etc/conf.d/lvm as well! - # Depending on your system, it might also introduce udev & mdraid - need sysfs ${_need} -} - -config='global { locking_dir = "/run/lock/lvm" }' - -dm_in_proc() { - local retval=0 - for x in devices misc ; do - grep -qs 'device-mapper' /proc/${x} - retval=$((${retval} + $?)) - done - return ${retval} -} - -start() { - # LVM support for /usr, /home, /opt .... - # This should be done *before* checking local - # volumes, or they never get checked. - - # 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!" - return 1 - fi - if [ -z "${CDBOOT}" ] ; then - if [ -e /proc/modules ] && ! dm_in_proc ; then - modprobe dm-mod 2>/dev/null - 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" - # 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" - if _need_lvmlockd; then - # Start lockd VGs as required - lvm_commands="${lvm_commands}vgchange --config '${config}' --lock-start --lock-opt auto\n" - 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" - fi - fi -} - -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!" - 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) - - 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 - 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" - return 0 - fi -} - -# vim:ts=4 diff --git a/sys-fs/lvm2/lvm2-2.03.09.ebuild b/sys-fs/lvm2/lvm2-2.03.09.ebuild index 17bc946ea786..40418f6bae35 100644 --- a/sys-fs/lvm2/lvm2-2.03.09.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.09.ebuild @@ -211,7 +211,7 @@ src_install() { if use !device-mapper-only ; then newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.03.05 lvm + newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm if ! use udev ; then # We keep the variable but remove udev from it. |