diff options
author | Mike Frysinger <vapier@gentoo.org> | 2016-04-02 01:06:37 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2016-04-02 01:06:37 -0400 |
commit | 470db86bf35977a176324617aec54eb36b625921 (patch) | |
tree | 26b2f62c63bc80d60f7fb44ab4acffefd1f79f7c /sys-fs/lvm2/files | |
parent | dev-python/python-efl: drop arm until nodejs can be keyworded (diff) | |
download | gentoo-470db86bf35977a176324617aec54eb36b625921.tar.gz gentoo-470db86bf35977a176324617aec54eb36b625921.tar.bz2 gentoo-470db86bf35977a176324617aec54eb36b625921.zip |
sys-fs/lvm2: drop old <2.02.116 versions
Diffstat (limited to 'sys-fs/lvm2/files')
-rw-r--r-- | sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 | 111 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 | 46 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm.rc-2.02.95-r2 | 96 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch | 93 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch | 104 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch | 47 |
6 files changed, 0 insertions, 497 deletions
diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 b/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 deleted file mode 100644 index 4cd506a41ff5..000000000000 --- a/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 +++ /dev/null @@ -1,111 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that - # means dmeventd is NOT notified, as it cannot be safely running - before dmeventd checkfs fsck - after modules -} - -dm_in_proc() { - local retval=0 - for x in devices misc ; do - grep -qs 'device-mapper' /proc/${x} - retval=$((${retval} + $?)) - done - return ${retval} -} - -# char **get_new_dm_volumes(void) -# -# Return dmsetup commands to setup volumes -get_new_dm_volumes() { - local volume params - - # Filter comments and blank lines - grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \ - while read volume params ; do - # If it exists, skip it - dmvolume_exists "${volume%:}" && continue - # Assemble the command to run to create volume - echo "echo ${params} | /sbin/dmsetup create ${volume%:}" - done - - return 0 -} - -# int dmvolume_exists(volume) -# -# Return true if volume exists in DM table -dmvolume_exists() { - local x line volume=$1 - - [ -z "${volume}" ] && return 1 - - /sbin/dmsetup ls 2>/dev/null | \ - while read line ; do - for x in ${line} ; do - # the following conditonal return only breaks out - # of the while loop, as it is running in a pipe. - [ "${x}" = "${volume}" ] && return 1 - # We only want to check the volume name - break - done - done - - # if 1 was returned from the above loop, then indicate that - # volume exists - [ $? = 1 ] && return 0 - - # otherwise the loop exited normally and the volume does not - # exist - return 1 -} - -# int is_empty_dm_volume(volume) -# -# Return true if the volume exists in DM table, but is empty/non-valid -is_empty_dm_volume() { - local table volume=$1 - - set -- $(/sbin/dmsetup table 2>/dev/null | grep -e "^${volume}:") - [ "${volume}" = "$1" -a -z "$2" ] -} - - -start() { - if [ -e /proc/modules ] && ! dm_in_proc ; then - modprobe dm-mod 2>/dev/null - fi - # Ensure the dirs exist for locking and running - checkpath -q -d -m 0700 -o root:root /run/lvm /run/lock/lvm - - local x volume - - if [ -x /sbin/dmsetup -a -c /dev/mapper/control -a -f /etc/dmtab ] ; then - [ -n "$(get_new_dm_volumes)" ] && \ - einfo " Setting up device-mapper volumes:" - - get_new_dm_volumes | \ - while read x ; do - [ -n "${x}" ] || continue - - volume="${x##* }" - - ebegin " Creating volume: ${volume}" - if ! eval "${x}" >/dev/null 2>/dev/null ; then - eend 1 " Error creating volume: ${volume}" - # dmsetup still adds an empty volume in some cases, - # so lets remove it - is_empty_dm_volume "${volume}" && \ - /sbin/dmsetup remove "${volume}" 2>/dev/null - else - eend 0 - fi - done - fi -} - diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 deleted file mode 100644 index 2a96706cad06..000000000000 --- a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 +++ /dev/null @@ -1,46 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# This script is based on upstream file -# LVM2.2.02.67/scripts/lvm2_monitoring_init_red_hat.in - -depend() { - # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that - # means dmeventd is NOT notified, as it cannot be safely running - need lvm dmeventd -} - -VGCHANGE=/sbin/vgchange -VGS=/sbin/vgs - -start() { - ret=0 - # TODO do we want to separate out already active groups only? - VGSLIST=`$VGS --noheadings -o name 2> /dev/null` - for vg in $VGSLIST - do - ebegin "Starting LVM monitoring for VG $vg:" - $VGCHANGE --monitor y --poll y $vg - ret2=$? - eend $ret2 - [ $ret2 -ne 0 ] && ret=$ret2 - done - return $ret -} - -stop() { - ret=0 - # TODO do we want to separate out already active groups only? - VGSLIST=`$VGS --noheadings -o name 2> /dev/null` - for vg in $VGSLIST - do - ebegin "Stopping LVM monitoring for VG $vg:" - $VGCHANGE --monitor n $vg - ret2=$? - eend $ret2 - [ $ret2 -ne 0 ] && ret=$ret2 - done - return $ret -} diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.95-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.95-r2 deleted file mode 100644 index d0d9e318c56b..000000000000 --- a/sys-fs/lvm2/files/lvm.rc-2.02.95-r2 +++ /dev/null @@ -1,96 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - use dmeventd - before checkfs fsck - after dmeventd modules device-mapper -} - -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 - 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} --config '${config}'\n" - # Extra PV find pass because some devices might not have been available until very recently - lvm_commands="${lvm_commands}pvscan\n" - # Now make the nodes - lvm_commands="${lvm_commands}vgscan --mknodes\n" - # And turn them on! - lvm_commands="${lvm_commands}vgchange --sysinit -a ly\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 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 2> /dev/null) - - if [ "$VGS" ] - then - ebegin " Shutting Down LVs & VGs" - #still echo stderr for debugging - lvm_commands="#! ${lvm_path} --config '${config}'\n" - # Extra PV find pass because some devices might not have been available until very recently - lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n" - # Now make the nodes - lvm_commands="${lvm_commands}vgchange --sysinit -a ln\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" - fi - - einfo "Finished Shutting down the Logical Volume Manager" -fi -} - -# vim:ts=4 diff --git a/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch b/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch deleted file mode 100644 index d6c8e5fd45c5..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -ur LVM2.2.02.100.orig/configure.in LVM2.2.02.100/configure.in ---- LVM2.2.02.100.orig/configure.in 2013-08-13 13:44:43.000000000 +0300 -+++ LVM2.2.02.100/configure.in 2013-09-12 23:23:19.365329440 +0300 -@@ -954,6 +954,7 @@ - pkg_config_init - fi - PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) -+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` - AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) - fi - -@@ -1199,19 +1200,32 @@ - if test x$SELINUX = xyes; then - AC_CHECK_LIB([sepol], [sepol_check_context], [ - AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) -- SELINUX_LIBS="-lsepol"]) -+ SEPOL_LIBS="-lsepol"]) - -- AC_CHECK_LIB([selinux], [is_selinux_enabled], [ -- AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) -- AC_CHECK_HEADERS([selinux/label.h]) -- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -- SELINUX_LIBS="-lselinux $SELINUX_LIBS" -+ dnl -- init pkgconfig if required -+ if test x$PKGCONFIG_INIT != x1; then -+ pkg_config_init -+ fi -+ PKG_CHECK_MODULES(SELINUX, libselinux, [ - SELINUX_PC="libselinux" -- HAVE_SELINUX=yes ], [ -- AC_MSG_WARN(Disabling selinux) -- SELINUX_LIBS= -- SELINUX_PC= -- HAVE_SELINUX=no ]) -+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` -+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" -+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -+ ],[ -+ dnl -- old non-pkgconfig method, is buggy with static builds -+ AC_CHECK_LIB([selinux], [is_selinux_enabled], [ -+ AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) -+ AC_CHECK_HEADERS([selinux/label.h]) -+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -+ SELINUX_LIBS="-lselinux $SEPOL_LIBS" -+ SELINUX_STATIC_LIBS="$SELINUX_LIBS" -+ SELINUX_PC="libselinux" -+ HAVE_SELINUX=yes ], [ -+ AC_MSG_WARN(Disabling selinux) -+ SELINUX_LIBS= -+ SELINUX_PC= -+ HAVE_SELINUX=no ]) -+ ]) - fi - - ################################################################################ -@@ -1615,6 +1629,7 @@ - AC_SUBST(SALCK_CFLAGS) - AC_SUBST(SALCK_LIBS) - AC_SUBST(SELINUX_LIBS) -+AC_SUBST(SELINUX_STATIC_LIBS) - AC_SUBST(SELINUX_PC) - AC_SUBST(SNAPSHOTS) - AC_SUBST(STATICDIR) -@@ -1625,6 +1640,7 @@ - AC_SUBST(THIN_DUMP_CMD) - AC_SUBST(THIN_REPAIR_CMD) - AC_SUBST(UDEV_LIBS) -+AC_SUBST(UDEV_STATIC_LIBS) - AC_SUBST(UDEV_PC) - AC_SUBST(UDEV_RULES) - AC_SUBST(UDEV_SYNC) -diff -ur LVM2.2.02.100.orig/make.tmpl.in LVM2.2.02.100/make.tmpl.in ---- LVM2.2.02.100.orig/make.tmpl.in 2013-08-13 13:44:43.000000000 +0300 -+++ LVM2.2.02.100/make.tmpl.in 2013-09-12 23:22:58.125328808 +0300 -@@ -32,7 +32,7 @@ - - LIBS = @LIBS@ - # Extra libraries always linked with static binaries --STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) -+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS += @CFLAGS@ @UDEV_CFLAGS@ -@@ -46,7 +46,9 @@ - PTHREAD_LIBS = @PTHREAD_LIBS@ - READLINE_LIBS = @READLINE_LIBS@ - SELINUX_LIBS = @SELINUX_LIBS@ -+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ - UDEV_LIBS = @UDEV_LIBS@ -+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ - TESTING = @TESTING@ - - # Setup directory variables diff --git a/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch deleted file mode 100644 index 723cd0e276e2..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/configure.in LVM2.2.02.107/configure.in ---- LVM2.2.02.107.orig/configure.in 2014-07-15 12:57:55.867439868 -0700 -+++ LVM2.2.02.107/configure.in 2014-07-15 17:24:02.662666091 -0700 -@@ -997,6 +997,7 @@ - fi]) - if test "$BLKID_WIPING" = yes; then - BLKID_PC="blkid" -+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` - AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) - fi - fi -@@ -1022,6 +1023,7 @@ - if test "$UDEV_SYNC" = yes; then - pkg_config_init - PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) -+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` - AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) - fi - -@@ -1242,19 +1244,32 @@ - if test "$SELINUX" = yes; then - AC_CHECK_LIB([sepol], [sepol_check_context], [ - AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) -- SELINUX_LIBS="-lsepol"]) -+ SEPOL_LIBS="-lsepol"]) -+ -+ dnl -- init pkgconfig if required -+ if test x$PKGCONFIG_INIT != x1; then -+ pkg_config_init -+ fi -+ PKG_CHECK_MODULES(SELINUX, libselinux, [ -+ SELINUX_PC="libselinux" -+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` -+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" -+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -+ ],[ -+ dnl -- old non-pkgconfig method, is buggy with static builds - - AC_CHECK_LIB([selinux], [is_selinux_enabled], [ - AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) - AC_CHECK_HEADERS([selinux/label.h]) - AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -- SELINUX_LIBS="-lselinux $SELINUX_LIBS" -+ SELINUX_LIBS="-lselinux $SEPOL_LIBS" - SELINUX_PC="libselinux" - HAVE_SELINUX=yes ], [ - AC_MSG_WARN(Disabling selinux) - SELINUX_LIBS= - SELINUX_PC= - HAVE_SELINUX=no ]) -+ ]) - fi - - ################################################################################ -@@ -1556,6 +1571,7 @@ - ################################################################################ - AC_SUBST(APPLIB) - AC_SUBST(AWK) -+AC_SUBST(BLKID_STATIC_LIBS) - AC_SUBST(BLKID_PC) - AC_SUBST(BLKID_WIPING) - AC_SUBST(BUILD_CMIRRORD) -@@ -1651,6 +1667,7 @@ - AC_SUBST(SALCK_CFLAGS) - AC_SUBST(SALCK_LIBS) - AC_SUBST(SELINUX_LIBS) -+AC_SUBST(SELINUX_STATIC_LIBS) - AC_SUBST(SELINUX_PC) - AC_SUBST(SNAPSHOTS) - AC_SUBST(STATICDIR) -@@ -1662,6 +1679,7 @@ - AC_SUBST(THIN_DUMP_CMD) - AC_SUBST(THIN_REPAIR_CMD) - AC_SUBST(THIN_RESTORE_CMD) -+AC_SUBST(UDEV_STATIC_LIBS) - AC_SUBST(UDEV_PC) - AC_SUBST(UDEV_RULES) - AC_SUBST(UDEV_SYNC) -diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/make.tmpl.in LVM2.2.02.107/make.tmpl.in ---- LVM2.2.02.107.orig/make.tmpl.in 2014-07-15 12:57:55.868439884 -0700 -+++ LVM2.2.02.107/make.tmpl.in 2014-07-15 17:23:24.060055838 -0700 -@@ -44,7 +44,7 @@ - - LIBS = @LIBS@ - # Extra libraries always linked with static binaries --STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) -+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS += @CFLAGS@ -@@ -59,10 +59,13 @@ - PTHREAD_LIBS = @PTHREAD_LIBS@ - READLINE_LIBS = @READLINE_LIBS@ - SELINUX_LIBS = @SELINUX_LIBS@ -+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ - UDEV_CFLAGS = @UDEV_CFLAGS@ - UDEV_LIBS = @UDEV_LIBS@ -+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ - BLKID_CFLAGS = @BLKID_CFLAGS@ - BLKID_LIBS = @BLKID_LIBS@ -+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ - TESTING = @TESTING@ - - # Setup directory variables diff --git a/sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch deleted file mode 100644 index 38be5dfaad0e..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- conf/example.conf.in -+++ conf/example.conf.in -@@ -50,7 +50,9 @@ - - - # By default we accept every block device: -- filter = [ "a/.*/" ] -+ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel -+ # noise when you probed while not available. -+ filter = [ "r|/dev/nbd.*|", "a/.*/" ] - - # Exclude the cdrom drive - # filter = [ "r|/dev/cdrom|" ] -@@ -259,6 +261,8 @@ - # the new lvm2 on-disk metadata format. - # The default value is set when the tools are built. - # fallback_to_lvm1 = 0 -+ # Gentoo: the LVM tools are a seperate package. -+ fallback_to_lvm1 = 0 - - # The default metadata format that commands should use - "lvm1" or "lvm2". - # The command line override is -M1 or -M2. -@@ -449,12 +453,12 @@ - - # Metadata settings - # --# metadata { -+metadata { - # Default number of copies of metadata to hold on each PV. 0, 1 or 2. - # You might want to override it from the command line with 0 - # when running pvcreate on new PVs which are to be added to large VGs. -- -- # pvmetadatacopies = 1 -+ # Gentoo: enable for data safety, but PV resize is then disabled. -+ #pvmetadatacopies = 2 - - # Approximate default size of on-disk metadata areas in sectors. - # You should increase this if you have large volume groups or -@@ -476,7 +480,7 @@ - # the supplied toolset to make changes (e.g. vgcfgrestore). - - # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] --#} -+} - - # Event daemon - # |