diff options
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/initscripts.spec b/initscripts.spec index 73c947a6..e1bc7544 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 078-1 Requires: popt >= 1.12-2 -Conflicts: mkinitrd < 4.0, kernel < 2.6.12 +Conflicts: mkinitrd < 4.0, kernel < 2.6.23 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 08adcc57..5bb40dd8 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -398,15 +398,6 @@ fi update_boot_stage RChostname action $"Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME} -# Initialize ACPI bits -if [ -d /proc/acpi ]; then - for module in /lib/modules/$unamer/kernel/drivers/acpi/* ; do - module=${module##*/} - module=${module%.ko} - modprobe $module >/dev/null 2>&1 - done -fi - # RAID setup update_boot_stage RCraid if [ -f /etc/mdadm.conf ]; then |