From 291ddd01b6577090da23028b2ae0643008420f80 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 11 Feb 1999 19:23:50 +0000 Subject: Remove support for modules/preferred, since we don't need it anymore. --- initscripts.spec | 4 ++-- rc.d/rc.sysinit | 22 ++-------------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 90b81994..22492ebc 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,13 +1,13 @@ Summary: inittab and /etc/rc.d scripts Name: initscripts -%define version 3.85 +%define version 3.90 Version: %{version} Copyright: GPL Group: Base Release: 2 Source: initscripts-%{version}.tar.gz BuildRoot: /var/tmp/initbld -Requires: mingetty, bash, mktemp, modutils >= 2.1.85-3, e2fsprogs, kbd +Requires: mingetty, bash, mktemp, modutils >= 2.1.85-3, e2fsprogs, kbd, kernel >= 2.2.1-rh3 Conflicts: redhat-release <= 5.1 Prereq: /sbin/chkconfig diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index a489d194..bb22371a 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -124,27 +124,9 @@ else USEMODULES= fi -# Set up kernel version-dependent symlinks. -rm -f /lib/modules/preferred - -if [ -n "$USEMODULES" ]; then - ktag="`cat /proc/version`" - mtag=`grep -l "$ktag" /lib/modules/*/.rhkmvtag` 2> /dev/null - if [ -n "$mtag" ]; then - mver=`echo $mtag | sed -e 's,/lib/modules/,,' -e 's,/.rhkmvtag,,' -e 's,[ ].*$,,'` - ln -sf /lib/modules/$mver /lib/modules/preferred - ln -sf /boot/System.map-$mver /boot/System.map - ln -sf /boot/module-info-$mver /boot/module-info - fi -fi - if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then - # Get ready for kerneld if module support in the kernel - if [ -e /lib/modules/preferred ]; then - action "Finding module dependencies" depmod -a preferred - else - action "Finding module dependencies" depmod -a - fi + # Get ready for kerneld/kmod if module support in the kernel + action "Finding module dependencies" depmod -a fi # load sound modules -- cgit v1.2.1