diff options
| author | Bill Nottingham <notting@redhat.com> | 2004-08-03 03:24:03 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2004-08-03 03:24:03 +0000 |
| commit | 195ab8107940776e554bc8e46b3d96fe2cc59df5 (patch) | |
| tree | 47ed8a54d187abec95e1d88284232444251e8233 | |
| parent | 0979057200c25bd91c70a226b5b40764bfd18ac2 (diff) | |
| download | initscripts-195ab8107940776e554bc8e46b3d96fe2cc59df5.tar initscripts-195ab8107940776e554bc8e46b3d96fe2cc59df5.tar.gz initscripts-195ab8107940776e554bc8e46b3d96fe2cc59df5.tar.bz2 initscripts-195ab8107940776e554bc8e46b3d96fe2cc59df5.tar.xz initscripts-195ab8107940776e554bc8e46b3d96fe2cc59df5.zip | |
don't remove /dev/mapper/control - nash will do it if it has to (#127115)
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec index 1d78d719..1d2d6e41 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -17,6 +17,7 @@ Requires: bash >= 2.0, SysVinit Requires: /sbin/ip, /sbin/arping, net-tools Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2 +Conflicts: mkinitrd < 4.0 Conflicts: kernel <= 2.4, timeconfig < 3.0, ppp < 2.3.9, wvdial < 1.40-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Obsoletes: rhsound sapinit diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 65d6599f..fb88fe02 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -386,7 +386,6 @@ if [ -x /sbin/lvm.static ]; then if ! LC_ALL=C fgrep -q "device-mapper" /proc/devices 2>/dev/null ; then modprobe dm-mod >/dev/null 2>&1 fi - /bin/rm -f /dev/mapper/control &> /dev/null echo "mkdmnod" | /sbin/nash --quiet >/dev/null 2>&1 [ -n "$SELINUX" ] && restorecon /dev/mapper/control >/dev/null 2>&1 if [ -c /dev/mapper/control -a -x /sbin/lvm.static ]; then |