diff options
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec index d7582c26..1c40c79f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -36,7 +36,7 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.7.0-0.2009.02.26 Conflicts: s390utils < 2:1.8.2-11 -Conflicts: dmraid < 1.0.0.rc16-7 +Conflicts: dmraid < 1.0.0.rc16-7, lvm2 < 2.02.65 Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 22138be1..03490a1e 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -376,9 +376,7 @@ fi [ -r /proc/mdstat -a -r /dev/md/md-device-map ] && /sbin/mdadm -IRs if [ -x /sbin/lvm ]; then - export LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 - action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --ignorelockingfailure --ignoremonitoring - unset LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES + action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit fi if [ -f /etc/crypttab ]; then |