diff --git a/lvm2.changes b/lvm2.changes index 3cf4b2a..1bd6249 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Oct 27 21:44:41 CET 2013 - ohering@suse.de + +- Remove /etc/sysconfig/lvm to avoid errors during mkinitrd run + LVM_VGS_ACTIVATED_ON_BOOT is not handled anymore with systemd +- Remove fillup and insserv from PreReq + ------------------------------------------------------------------- Mon Oct 21 08:09:41 UTC 2013 - dmzhang@suse.com diff --git a/lvm2.spec b/lvm2.spec index f2845d4..6f2dc8e 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -28,7 +28,7 @@ BuildRequires: readline-devel BuildRequires: pkgconfig(udev) Requires: device-mapper >= 1.02.25 Provides: lvm -PreReq: %fillup_prereq %insserv_prereq /sbin/mkinitrd +PreReq: /sbin/mkinitrd Version: 2.02.98 Release: 0. Summary: Logical Volume Manager Tools @@ -38,7 +38,6 @@ Source: ftp://sources.redhat.com/pub/%{name}/LVM2.%{version}.tgz Source42: ftp://sources.redhat.com/pub/%{name}/LVM2.%{version}.tgz.asc Source1: lvm.conf #Source2: boot.lvm -Source3: sysconfig.lvm Source4: mkinitrd-lvm2-setup.sh Source5: mkinitrd-lvm2-boot.sh #Source6: 64-lvm2.rules @@ -134,8 +133,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-lvm2.sh install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-lvm2.sh -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates install -m755 -D %{S:8} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/clvmd install -m755 -D %{S:10} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/cmirrord @@ -213,7 +210,6 @@ rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.service /lib/mkinitrd/scripts/setup-lvm2.sh /lib/mkinitrd/scripts/boot-lvm2.sh /usr/lib/systemd/system-generators/lvm2-activation-generator -/var/adm/fillup-templates/sysconfig.lvm /sbin/blkdeactivate /sbin/fsadm /sbin/lvchange diff --git a/mkinitrd-lvm2-setup.sh b/mkinitrd-lvm2-setup.sh index 27d2b77..23e9d0c 100644 --- a/mkinitrd-lvm2-setup.sh +++ b/mkinitrd-lvm2-setup.sh @@ -34,11 +34,9 @@ fi if use_script lvm2; then tmp_root_dm=1 # lvm needs dm - mkdir -p $tmp_mnt/etc/sysconfig mkdir -p $tmp_mnt/etc/lvm mkdir -p $tmp_mnt/var/lock/lvm 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/usr/lib/udev/rules.d cp /usr/lib/udev/rules.d/11-dm-lvm.rules $tmp_mnt/usr/lib/udev/rules.d/ diff --git a/sysconfig.lvm b/sysconfig.lvm deleted file mode 100644 index 4fb7854..0000000 --- a/sysconfig.lvm +++ /dev/null @@ -1,11 +0,0 @@ -## Path: System/File systems/LVM -## Description: LVM configuration -## Type: string -## Default: "" -# -# This variable allows to only activate the LVM volume groups listed at -# bootup. If it is empty, all LVM volume groups are activated at bootup. -# This variable needs setting only under very special circumstances. -# For almost all standard LVM installations it can safely stay empty. -# -LVM_VGS_ACTIVATED_ON_BOOT=""