From c92b396f181641e5d6dfc1864e6781cf734b91d5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 29 May 2012 15:34:00 +0200 Subject: [PATCH] lvm2: remove initramfs-tools support. --- srcpkgs/lvm2/device-mapper.template | 2 -- srcpkgs/lvm2/files/11-dm-initramfs.rules | 3 -- srcpkgs/lvm2/files/lvm2.initramfs-hook | 40 --------------------- srcpkgs/lvm2/files/lvm2.initramfs-local-top | 28 --------------- srcpkgs/lvm2/template | 9 +---- 5 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 srcpkgs/lvm2/files/11-dm-initramfs.rules delete mode 100644 srcpkgs/lvm2/files/lvm2.initramfs-hook delete mode 100644 srcpkgs/lvm2/files/lvm2.initramfs-local-top diff --git a/srcpkgs/lvm2/device-mapper.template b/srcpkgs/lvm2/device-mapper.template index 33161f779a6..5887f61a8e1 100644 --- a/srcpkgs/lvm2/device-mapper.template +++ b/srcpkgs/lvm2/device-mapper.template @@ -16,6 +16,4 @@ do_install() { for f in 10-dm 13-dm-disk 95-dm-notify; do vmove lib/udev/rules.d/${f}.rules lib/udev/rules.d done - vinstall ${FILESDIR}/11-dm-initramfs.rules 644 \ - usr/share/initramfs-tools/udev-rules } diff --git a/srcpkgs/lvm2/files/11-dm-initramfs.rules b/srcpkgs/lvm2/files/11-dm-initramfs.rules deleted file mode 100644 index 45438e42201..00000000000 --- a/srcpkgs/lvm2/files/11-dm-initramfs.rules +++ /dev/null @@ -1,3 +0,0 @@ -# needed with new udev and as implemented in dracut: -# -SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/srcpkgs/lvm2/files/lvm2.initramfs-hook b/srcpkgs/lvm2/files/lvm2.initramfs-hook deleted file mode 100644 index 5d88965bf75..00000000000 --- a/srcpkgs/lvm2/files/lvm2.initramfs-hook +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -PREREQ="" - -prereqs() -{ - echo "$PREREQ" -} - -case $1 in -prereqs) - prereqs - exit 0 - ;; -esac - -if [ ! -x /usr/sbin/lvm -o ! -x /usr/sbin/dmsetup ]; 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 - -mkdir -p ${DESTDIR}/lib/udev/rules.d -for f in 10-dm 11-dm-lvm 13-dm-disk 95-dm-notify; do - cp /lib/udev/rules.d/${f}.rules ${DESTDIR}/lib/udev/rules.d -done -cp /usr/share/initramfs-tools/udev-rules/11-dm-initramfs.rules \ - ${DESTDIR}/lib/udev/rules.d - -copy_exec /usr/sbin/dmsetup /sbin -copy_exec /usr/sbin/lvm /sbin - -for x in dm_mod dm_snapshot dm_mirror; do - manual_add_modules ${x} -done diff --git a/srcpkgs/lvm2/files/lvm2.initramfs-local-top b/srcpkgs/lvm2/files/lvm2.initramfs-local-top deleted file mode 100644 index 560f650d170..00000000000 --- a/srcpkgs/lvm2/files/lvm2.initramfs-local-top +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -PREREQ="mdadm mdrun multipath" - -prereqs() -{ - echo "$PREREQ" -} - -case $1 in -# get pre-requisites -prereqs) - prereqs - exit 0 - ;; -esac - -[ ! -e /sbin/lvm ] && exit 0 -[ ! -e /dev/urandom ] && mknod /dev/urandom c 1 9 - -modprobe -q dm-mod >/dev/null 2>&1 -if [ -e /sys/class/misc/device-mapper ]; then - echo "Scanning for Logical Volumes..." - /sbin/lvm vgscan --ignorelockingfailure - echo "Activating Logical Volumes..." - /sbin/lvm vgchange --ignoremonitoring --ignorelockingfailure -ay -fi -exit $? diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index 3524b021d21..aa863f5f31a 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -1,7 +1,7 @@ # Template file for 'lvm2' pkgname=lvm2 version=2.02.95 -revision=6 +revision=7 wrksrc=LVM2.${version} distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz" build_style=gnu-configure @@ -28,15 +28,8 @@ long_desc=" (kind of logical partitions) in volume groups." post_install() { - local initramfsdir=usr/share/initramfs-tools - vmkdir etc/lvm/archive touch ${DESTDIR}/etc/lvm/archive/.owned vmkdir etc/lvm/backup touch ${DESTDIR}/etc/lvm/backup/.owned - - vinstall ${FILESDIR}/lvm2.initramfs-hook 755 \ - ${initramfsdir}/hooks lvm2 - vinstall ${FILESDIR}/lvm2.initramfs-local-top 755 \ - ${initramfsdir}/scripts/local-top lvm2 }