Accepting request 140262 from Base:System

Adapt mkinitrd scripts to new udev locataion (forwarded request 140202 from sumski)

OBS-URL: https://build.opensuse.org/request/show/140262
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=49

lvm2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Nov  5 12:08:26 UTC 2012 - hrvoje.senjan@gmail.com
+
+- Adapt mkinitrd scripts to new udev locataion
+
+-------------------------------------------------------------------
+Sun Nov  4 02:31:00 UTC 2012 - crrodriguez@opensuse.org
+
+- Fix booting ... place udev rules in the proper location..
+
 -------------------------------------------------------------------
 Thu Oct 18 12:35:30 UTC 2012 - hrvoje.senjan@gmail.com
 

lvm2.spec

@@ -73,6 +73,7 @@ Obsoletes:      evms <= 2.5.5
 Obsoletes:      evms-devel <= 2.5.5
 Obsoletes:      evms-gui <= 2.5.5
 Obsoletes:      evms-ha <= 2.5.5
+%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
 
 %description
 Programs and man pages for configuring and using the LVM2 Logical
@@ -81,7 +82,7 @@ Volume Manager.
 
 
 %prep
-%setup -n LVM2.%{version}
+%setup -q -n LVM2.%{version}
 %patch -p1
 %patch2
 %patch3
@@ -102,7 +103,7 @@ export MODPROBE_CMD=/sbin/modprobe
 %configure --prefix=/ \
 	--bindir=/bin --libdir=/%_lib --with-usrlibdir=%_libdir \
 	--sbindir=/sbin --enable-dmeventd \
-	--with-udevdir=/lib/udev/rules.d \
+	--with-udevdir=%{_udevrulesdir} \
 	--with-dmeventd_path=/sbin/dmeventd \
 	--with-device-uid=0 --with-device-gid=6 --with-device-mode=0640 \
 	--enable-udev_sync --enable-udev_rules \
@@ -185,10 +186,7 @@ fi
 %config /etc/init.d/boot.lvm
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
-%dir /lib/udev
-%dir /lib/udev/rules.d
-#/lib/udev/rules.d/64-lvm2.rules
-/lib/udev/rules.d/11-dm-lvm.rules
+%{_udevrulesdir}/11-dm-lvm.rules
 /lib/udev/collect_lvm
 /lib/mkinitrd/scripts/setup-lvm2.sh
 /lib/mkinitrd/scripts/boot-lvm2.sh
@@ -337,12 +335,10 @@ mapper.
 %config /etc/init.d/boot.device-mapper
 /%_lib/libdevmapper.so.1.02
 /%_lib/libdevmapper-event.so.1.02
-%dir /lib/udev/rules.d
-%dir /lib/udev
-/lib/udev/rules.d/10-dm.rules
+%{_udevrulesdir}/10-dm.rules
 #/lib/udev/rules.d/12-dm-permissions.rules
-/lib/udev/rules.d/13-dm-disk.rules
-/lib/udev/rules.d/95-dm-notify.rules
+%{_udevrulesdir}/13-dm-disk.rules
+%{_udevrulesdir}/95-dm-notify.rules
 /sbin/dmsetup
 /sbin/dmeventd
 %{_mandir}/man8/dmsetup.8.gz

mkinitrd-devmapper-setup.sh

@@ -31,10 +31,10 @@ if [ -x /sbin/dmsetup ]; then
     # include dm block var from sysconfig
     mkdir -p etc/sysconfig
     grep DM_BLOCK /etc/sysconfig/kernel > etc/sysconfig/kernel
-	mkdir -p lib/udev/rules.d
-	cp /lib/udev/rules.d/10-dm.rules lib/udev/rules.d
-	cp /lib/udev/rules.d/13-dm-disk.rules lib/udev/rules.d
-	cp /lib/udev/rules.d/95-dm-notify.rules lib/udev/rules.d
+	mkdir -p usr/lib/udev/rules.d
+	cp usr/lib/udev/rules.d/10-dm.rules usr/lib/udev/rules.d
+	cp usr/lib/udev/rules.d/13-dm-disk.rules usrlib/udev/rules.d
+	cp usr/lib/udev/rules.d/95-dm-notify.rules usr/lib/udev/rules.d
     save_var root_dm
     save_var dm_modules
 fi

mkinitrd-lvm2-setup.sh

@@ -40,10 +40,10 @@ if use_script lvm2; then
     cp -a /etc/lvm/lvm.conf $tmp_mnt/etc/lvm/
 	cp -a /etc/sysconfig/lvm $tmp_mnt/etc/sysconfig/
 # udev rule for lvm2
-	mkdir -p $tmp_mnt/lib/udev/rules.d
-	cp /lib/udev/rules.d/11-dm-lvm.rules $tmp_mnt/lib/udev/rules.d/
-	if [ -e /lib/udev/rules.d/64-lvm2.rules ]; then
-		cp /lib/udev/rules.d/64-lvm2.rules $tmp_mnt/lib/udev/rules.d/
+	mkdir -p $tmp_mnt/usr/lib/udev/rules.d
+	cp /usr/lib/udev/rules.d/11-dm-lvm.rules $tmp_mnt/usr/lib/udev/rules.d/
+	if [ -e /usr/lib/udev/rules.d/64-lvm2.rules ]; then
+		cp /usr/lib/udev/rules.d/64-lvm2.rules $tmp_mnt/usr/lib/udev/rules.d/
 	fi
 fi