- poprawiony błąd "Delaying xxxx initialization." mimo poprawnej konfiguracji

- tworzone są poprawne linki do /boot/System.map-version

svn-id: @456

diff --git a/README b/README
index 4eeebd6f1398145ee3c3f2449b8a118a74e604b2..346f8fae4269b7554ec8b0eaf2b8baadecf84503 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,7 @@
 
-       $Id: README,v 1.2 1999/07/13 12:49:34 misiek Exp $
+       $Id: README,v 1.3 1999/08/02 10:08:02 misiek Exp $
+
+If you want use this rc-scripts remember to compile 'netlink'
+support into your kernel. This is very important !
+([*] Kernel/User netlink socket)
 

diff --git a/rc.d/init.d/functions.network b/rc.d/init.d/functions.network
index edb29d2679981db141b689600d1f900964a6c576..8f27ad2633bac2dd07ad5a76ad2c9f2d5e7d7fcb 100755 (executable)
--- a/rc.d/init.d/functions.network
+++ b/rc.d/init.d/functions.network
@@ -1,5 +1,5 @@
 #
-# $Id: functions.network,v 1.12 1999/07/31 11:24:19 misiek Exp $
+# $Id: functions.network,v 1.13 1999/08/02 10:08:05 misiek Exp $
 #
 # This is not a shell script; it provides functions to network scripts
 # that source it.
@@ -168,7 +168,7 @@ ip link set dev lo down
 
 static_arp()
 {
-if [ "$1" == "yes" ]; then
+if [ "$STATIC_ARP" == "yes" ]; then
        if [ -f /etc/ethers -a -x /sbin/arp ]; then
                /sbin/arp -f /etc/ethers
        fi

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 79d4fdd5d8a9b4fabecc3a6981ac391eb2fc89e3..dea1a0b356a354c7b6dbeb34ba8bc913447759d8 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.16 1999/07/31 11:24:18 misiek Exp $
+# $Id: rc.sysinit,v 1.17 1999/08/02 10:08:04 misiek Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -163,38 +163,37 @@ else
        USEMODULES=
 fi
 
-# Set up kernel version-dependent symlinks.
+# Kernel dependent links
 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
-
+rm -f /lib/modules/default
 if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then
-       # Get ready for kerneld if module support in the kernel
-       if [ -e /lib/modules/preferred ]; then
-               run_cmd "Finding module dependencies" depmod -a preferred
-       else
-               run_cmd "Finding module dependencies" depmod -a
-       fi
+    # Get ready for kmod if module support in the kernel
+    if [ -z `uname -r | grep "-"` ]; then
+       # we're using a new kernel, no preferred needed
+       mver=`uname -r`
+    else
+       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,[       ].*$,,'
+       fi
+       if [ -n "$mver" ]; then
+         ln -sf /lib/modules/$mver /lib/modules/default
+       fi
+    fi
+    [ -n "$mver" -a -f "/boot/module-info-$mver" ] && ln -sf /boot/module-info-$mver /boot/module-info
+    [ -n "$mver" -a -f "/boot/System.map-$mver" ] && ln -sf /boot/System.map-$mver /boot/System.map
+    run_cmd "Finding module dependencies" depmod -as
 fi
 
 # load sound modules
-if  (! grep -i nomodules /proc/cmdline >/dev/null) && [ "$LOAD_SOUND" == "yes" ]; then
-       if [ -n "$USEMODULES" ]; then
-               if grep -s "alias sound" /etc/modules.conf > /dev/null ; then
-                       run_cmd "Loading sound module" modprobe sound
-                       if grep -s "alias midi" /etc/conf.modules > /dev/null ; then
-                               run_cmd "Loading midi module" modprobe midi
-                       fi
-               fi
-       fi
+if [ -n "$USEMODULES" ] && [ "$LOAD_SOUND" == "yes" ]; then
+   if grep -s -q "^alias sound" /etc/conf.modules ; then
+      run_cmd "Loading sound module" modprobe sound
+   fi
+   if grep -s -q "^alias midi" /etc/conf.modules ; then
+      run_cmd "Loading midi module" modprobe midi
+   fi
 fi
 
 if [ -f /proc/sys/kernel/modprobe ]; then

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 23656cd687636c50b0d9d49a4f4d716180eb1c2b..87fdee1ba5e8472e5ed400a7de2f8817dd44486b 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup,v 1.18 1999/07/31 11:24:20 misiek Exp $
+#      $Id: ifup,v 1.19 1999/08/02 10:08:05 misiek Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -87,8 +87,7 @@ if [ -x "$OTHERSCRIPT" -a -z "$IPv6_ONLY" ]; then
 fi
 
 # is this device available? (this catches PCMCIA devices for us)
-/sbin/ip link show ${DEVICE} 2>&1 | grep -s "does not exist" > /dev/null
-if [ "$?" == "0" ]; then
+if ! (/sbin/ip link set arp ${ARP} dev ${DEVICE} > /dev/null 2>&1); then
     echo "Delaying ${FULLDEVNAME} initialization."
     exit 0
 fi

diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index 7f31ee72ce3913d54efcdda1211cccc70de9fe51..7e0d2be53e85713c6210faf9d4ba66d96c82bfd8 100755 (executable)
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup-post,v 1.8 1999/07/31 11:24:20 misiek Exp $
+#      $Id: ifup-post,v 1.9 1999/08/02 10:08:05 misiek Exp $
 #
 
 cd /etc/sysconfig/network-scripts
@@ -12,7 +12,7 @@ source_config
 
 # pelna nazwa dewajsa jaka podal user
 FULLDEVNAME="$DEVICE"
-# przyjmuje warto¶æ np: "dummy" czy "eth" itd. (do poprawki - teraz przyjmuje "dummy0:")
+# przyjmuje warto¶æ np: "dummy" czy "eth" itd.
 DEVICETYPE=`echo $FULLDEVNAME | sed "s/[0-9]*$//"`
 # przyjmuje eth0 przy {eth0,eth0:1,eth0:alias}
 DEVICE=`echo $FULLDEVNAME | sed 's/:.*//g'`