- rel 7

- drop initramfs package, it was never properly tested, never really updated
  and initramfs-tools functionality is obsoleted by dracut

Changed files:
    lvm2-initramfs-hook -> 1.2
    lvm2-initramfs-local-top -> 1.2
    lvm2.spec -> 1.199

diff --git a/lvm2-initramfs-hook b/lvm2-initramfs-hook
deleted file mode 100644 (file)
index 7055026..0000000
--- a/lvm2-initramfs-hook
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-if [ ! -x /sbin/lvm ]; then
-       exit 0
-fi
-
-. /usr/share/initramfs-tools/hook-functions
-
-if [ -e /etc/lvm/lvm.conf ]; then
-       mkdir -p ${DESTDIR}/etc/lvm
-       cp /etc/lvm/lvm.conf ${DESTDIR}/etc/lvm/
-fi
-
-copy_exec /sbin/lvm /sbin
-ln -s lvm ${DESTDIR}/sbin/vgchange
-
-for x in dm_mod dm_snapshot dm_mirror; do
-       manual_add_modules ${x}
-done

diff --git a/lvm2-initramfs-local-top b/lvm2-initramfs-local-top
deleted file mode 100644 (file)
index 8902728..0000000
--- a/lvm2-initramfs-local-top
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-PREREQ="mdadm mdrun"
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-activate_vg()
-{
-       local vg="$1"
-
-       # Make sure that we have a non-empty argument
-       if [ -z "${vg}" ]; then
-               return 1
-       fi
-
-       # Take care of lilo boot arg, risky activating of all vg
-       case $vg in
-       fe[0-9]*)
-               lvm vgchange -aly --ignorelockingfailure
-               exit 0
-               ;;
-       # FIXME: check major
-       /dev/root)
-               lvm vgchange -aly --ignorelockingfailure
-               exit 0
-               ;;
-       esac
-
-       # Make sure that we have a d-m path
-       vg=${vg#/dev/mapper/}
-       if [ "$vg" = "$1" ]; then
-               return 1
-       fi
-
-       # Make sure that the device includes at least one dash
-       if [ "$(echo -n "$vg" | tr -d -)" = "$vg" ]; then
-               return 1
-       fi
-
-       # Split volume group from logical volume.
-       vg=$(echo ${vg} | sed -e 's#\(.*\)\([^-]\)-[^-].*#\1\2#')
-       # Reduce padded --'s to -'s
-       vg=$(echo ${vg} | sed -e 's#--#-#g')
-
-       lvm vgchange -aly --ignorelockingfailure ${vg}
-}
-
-if [ ! -e /sbin/lvm ]; then
-       exit 0
-fi
-
-/sbin/modprobe -q dm-mod
-/sbin/modprobe -q dm-snapshot
-/sbin/modprobe -q dm-mirror
-
-activate_vg "$ROOT"
-activate_vg "$resume"
-
-exit 0

diff --git a/lvm2.spec b/lvm2.spec
index 7db3f183839d96d181f4397f45d5460dbe389cb1..34504be9acaf7c774b812ea094bde23e96f67b43 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -43,14 +43,12 @@ Summary:    The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):     Nowa wersja Logical Volume Managera dla Linuksa
 Name:          lvm2
 Version:       2.02.95
-Release:       6
+Release:       7
 License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
 # Source0-md5: bd470a802046c807603618a443732ea7
-Source1:       %{name}-initramfs-hook
-Source2:       %{name}-initramfs-local-top
-Source3:       %{name}-tmpfiles.conf
+Source1:       %{name}-tmpfiles.conf
 Patch0:                %{name}-selinux.patch
 Patch1:                %{name}-diet.patch
 Patch2:                device-mapper-dmsetup-export.patch
@@ -240,21 +238,6 @@ narzędzia do zarządzania logicznymi wolumenami.
 Ten pakiet zawiera program dmsetup skonsolidowany statycznie na
 potrzeby initrd.
 
-%package initramfs
-Summary:       The new version of Logical Volume Manager for Linux - support scripts for initramfs-tools
-Summary(pl.UTF-8):     Nowa wersja Logical Volume Managera dla Linuksa - skrypty dla initramfs-tools
-Group:         Base
-Requires:      %{name} = %{version}-%{release}
-Requires:      initramfs-tools
-
-%description initramfs
-The new version of Logical Volume Manager for Linux - support scripts
-for initramfs-tools.
-
-%description initramfs -l pl.UTF-8
-Nowa wersja Logical Volume Managera dla Linuksa - skrypty dla
-initramfs-tools.
-
 %prep
 %setup -q -n LVM2.%{version}
 %{?with_selinux:%patch0 -p1}
@@ -354,8 +337,7 @@ unset CC
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm} \
-       $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/local-top}
+install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm}
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 
 %{__make} install install_system_dirs install_systemd_units install_initscripts \
@@ -364,7 +346,7 @@ install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm} \
        GROUP=""
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
 
 mv $RPM_BUILD_ROOT%{_libdir}/lib*.so.* $RPM_BUILD_ROOT/%{_lib}
 for lib in $RPM_BUILD_ROOT/%{_lib}/lib*.so.*; do
@@ -383,9 +365,6 @@ install -p initrd-dmsetup $RPM_BUILD_ROOT%{_libdir}/initrd/dmsetup
 %{?with_dietlibc:cp -a diet-libdevmapper.a $RPM_BUILD_ROOT%{dietlibdir}/libdevmapper.a}
 %endif
 
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/lvm2
-install -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-top/lvm2
-
 cp -a libdm/libdevmapper.a $RPM_BUILD_ROOT%{_libdir}
 
 %clean
@@ -497,8 +476,3 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/initrd/lvm
 %endif
-
-%files initramfs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_datadir}/initramfs-tools/hooks/lvm2
-%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/local-top/lvm2