- rel 6

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

Changed files:
    dmraid-initramfs-hook -> 1.2
    dmraid-initramfs-local-top -> 1.2
    dmraid.spec -> 1.50

diff --git a/dmraid-initramfs-hook b/dmraid-initramfs-hook
deleted file mode 100644 (file)
index ad7e1b2..0000000
--- a/dmraid-initramfs-hook
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-. /usr/share/initramfs-tools/hook-functions
-
-if [ -x /sbin/dmraid ]; then
-       force_load dm-mod
-       force_load dm-mirror
-       force_load dm-raid45
-       copy_exec /sbin/dmraid sbin
-       copy_exec /sbin/dmraid-activate sbin
-       if [ -f /etc/udev/rules.d/85_dmraid.rules ]; then
-               mkdir -p ${DESTDIR}/etc/udev/rules.d
-               cp -p /etc/udev/rules.d/85_dmraid.rules ${DESTDIR}/etc/udev/rules.d
-       fi
-       if [ -f /etc/udev/rules.d/85-dmraid.rules ]; then
-               mkdir -p ${DESTDIR}/etc/udev/rules.d
-               cp -p /etc/udev/rules.d/85-dmraid.rules ${DESTDIR}/etc/udev/rules.d
-       fi
-       if [ -f /lib/udev/rules.d/85_dmraid.rules ]; then
-               mkdir -p ${DESTDIR}/lib/udev/rules.d
-               cp -p /lib/udev/rules.d/85_dmraid.rules ${DESTDIR}/lib/udev/rules.d
-       fi
-       if [ -f /lib/udev/rules.d/85-dmraid.rules ]; then
-               mkdir -p ${DESTDIR}/lib/udev/rules.d
-               cp -p /lib/udev/rules.d/85-dmraid.rules ${DESTDIR}/lib/udev/rules.d
-       fi
-fi
-
-exit 0

diff --git a/dmraid-initramfs-local-top b/dmraid-initramfs-local-top
deleted file mode 100644 (file)
index 445433a..0000000
--- a/dmraid-initramfs-local-top
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# local-top script for dmraid.
-
-PREREQS=""
-prereqs()
-{
-       echo $PREREQS
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-# Activate any dmraid arrays that were not identified by udev and vol_id.
-
-for dev in $(dmraid -r -c); do
-       dmraid-activate $(basename $dev)
-done

diff --git a/dmraid.spec b/dmraid.spec
index 519b5eabcb9b2dc5de2ab5a0887018cd75191c11..6b18d535fabce1d56aef0fd1c4e7a31ed8ab87a4 100644 (file)
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -9,13 +9,11 @@ Summary(pl.UTF-8):    Narzędzie do RAID-u opartego o device-mapper
 Name:          dmraid
 Version:       1.0.0
 %define        _rc     rc15
-Release:       0.%{_rc}.5
+Release:       0.%{_rc}.6
 License:       GPL
 Group:         Base
 Source0:       http://people.redhat.com/~heinzm/sw/dmraid/src/%{name}-%{version}.%{_rc}.tar.bz2
 # Source0-md5: 2602887205a35f89b59eeba3a868150f
-Source1:       %{name}-initramfs-hook
-Source2:       %{name}-initramfs-local-top
 Patch0:                %{name}-selinux-static.patch
 Patch1:                %{name}-fix.patch
 Patch2:                %{name}-optflags.patch
@@ -99,19 +97,6 @@ Statically linked version of dmraid utility.
 %description initrd -l pl.UTF-8
 Statycznie skonsolidowana wersja programu narzędziowego dmraid.
 
-%package initramfs
-Summary:       Device-mapper RAID tool - support scripts for initramfs-tools
-Summary(pl.UTF-8):     Narzędzie do RAID-u opartego o device-mapper - skrypty dla initramfs-tools
-Group:         Base
-Requires:      %{name} = %{version}-%{release}
-Requires:      initramfs-tools
-
-%description initramfs
-Device-mapper RAID tool - support scripts for initramfs-tools.
-
-%description initramfs -l pl.UTF-8
-Narzędzie do RAID-u opartego o device-mapper - skrypty dla initramfs-tools.
-
 %prep
 %setup -q -n %{name}
 mv */* ./
@@ -152,7 +137,7 @@ mv -f tools/dmraid dmraid-initrd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib},%{_datadir}/initramfs-tools/{hooks,scripts/local-top}}
+install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
        includedir=$RPM_BUILD_ROOT%{_includedir} \
@@ -169,9 +154,6 @@ install -d $RPM_BUILD_ROOT%{_libdir}/initrd
 install dmraid-initrd $RPM_BUILD_ROOT%{_libdir}/initrd/dmraid
 %endif
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/dmraid
-install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-top/dmraid
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -199,8 +181,3 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/initrd/dmraid
 %endif
-
-%files initramfs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_datadir}/initramfs-tools/hooks/dmraid
-%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/local-top/dmraid