Hello community,
here is the log from the commit of package lvm2 for openSUSE:Factory checked in
at 2012-11-10 16:54:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lvm2 (Old)
and /work/SRC/openSUSE:Factory/.lvm2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lvm2", Maintainer is "dmzh...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lvm2/lvm2.changes 2012-10-25
12:10:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lvm2.new/lvm2.changes 2012-11-10
16:54:56.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Nov 5 12:08:26 UTC 2012 - hrvoje.sen...@gmail.com
+
+- Adapt mkinitrd scripts to new udev locataion
+
+-------------------------------------------------------------------
+Sun Nov 4 02:31:00 UTC 2012 - crrodrig...@opensuse.org
+
+- Fix booting ... place udev rules in the proper location..
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lvm2.spec ++++++
--- /var/tmp/diff_new_pack.zCnGwk/_old 2012-11-10 16:54:57.000000000 +0100
+++ /var/tmp/diff_new_pack.zCnGwk/_new 2012-11-10 16:54:57.000000000 +0100
@@ -73,6 +73,7 @@
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 @@
%prep
-%setup -n LVM2.%{version}
+%setup -q -n LVM2.%{version}
%patch -p1
%patch2
%patch3
@@ -102,7 +103,7 @@
%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 @@
%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 @@
%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 ++++++
--- /var/tmp/diff_new_pack.zCnGwk/_old 2012-11-10 16:54:57.000000000 +0100
+++ /var/tmp/diff_new_pack.zCnGwk/_new 2012-11-10 16:54:57.000000000 +0100
@@ -31,10 +31,10 @@
# 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 ++++++
--- /var/tmp/diff_new_pack.zCnGwk/_old 2012-11-10 16:54:57.000000000 +0100
+++ /var/tmp/diff_new_pack.zCnGwk/_new 2012-11-10 16:54:57.000000000 +0100
@@ -40,10 +40,10 @@
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
