diff options
| -rw-r--r-- | initscripts.spec | 3 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec index 3ffeb013..95bd06bf 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -20,7 +20,8 @@ Requires: ethtool >= 1.8-2, kernel >= 2.6.12, /sbin/nash, /sbin/runuser Conflicts: mkinitrd < 4.0 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: udev < 0:048 -Conflicts: tcsh < 6.13-5, diskdumputils < 1.1.0 +Conflicts: tcsh < 6.13-5 +#Conflicts: diskdumputils < 1.1.0 Obsoletes: rhsound sapinit Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, mktemp, fileutils, sh-utils BuildPrereq: glib2-devel popt gettext pkgconfig diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 0c3de9aa..23c132fa 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -610,9 +610,9 @@ mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1 chown root:root /tmp/.ICE-unix [ -n "$SELINUX" ] && restorecon /tmp/.ICE-unix >/dev/null 2>&1 -if [ -x /etc/init.d/diskdump ]; then - /etc/init.d/diskdump swapsavecore -fi +#if [ -x /etc/init.d/diskdump ]; then +# /etc/init.d/diskdump swapsavecore +#fi # Start up swapping. update_boot_stage RCswap |