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
This commit is contained in:
Stephan Kulow 2012-11-10 15:54:55 +00:00 committed by Git OBS Bridge
commit 723f8c7462
4 changed files with 25 additions and 19 deletions

View File

@ -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 Thu Oct 18 12:35:30 UTC 2012 - hrvoje.senjan@gmail.com

View File

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

View File

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

View File

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