[src/netbsd-2]: src/etc Pull up following revision(s) (requested by cube in t...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/95a2e5619b99
branches:  netbsd-2
changeset: 564081:95a2e5619b99
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Oct 11 16:54:38 2005 +0000

description:
Pull up following revision(s) (requested by cube in ticket #5925):
        etc/rc.lkm: revision 1.9
modload(8) already obtain the value of the machdep.booted_kernel sysctl
node, and use it as a reasonable default when no -A option is passed.
The difference is, modload(8) prefers /dev/ksyms rather than the sysctl
node, which is the behaviour we really want.
Unconditionally passing -A in rc.lkm prevents the loading of inter-
dependent modules from rc.d, as reported by Jeff Rizzo on netbsd-users.

diffstat:

 etc/rc.lkm |  10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diffs (24 lines):

diff -r 85a735143496 -r 95a2e5619b99 etc/rc.lkm
--- a/etc/rc.lkm        Tue Oct 11 16:49:51 2005 +0000
+++ b/etc/rc.lkm        Tue Oct 11 16:54:38 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: rc.lkm,v 1.8 2003/01/05 22:47:13 christos Exp $
+#      $NetBSD: rc.lkm,v 1.8.4.1 2005/10/11 16:54:38 riz Exp $
 #
 # this script loads or unloads LKMs (loadable kernel modules).
 
@@ -77,14 +77,6 @@
                                continue
                        fi
        
-                       # try to find out booted kernel via sysctl
-                       # if supported
-                       booted_kernel=`/sbin/sysctl -n machdep.booted_kernel 2>/dev/null`
-                       if [ ! -z "$booted_kernel" -a -r "$booted_kernel" ];
-                       then
-                               flags="-A $booted_kernel $flags"
-                       fi
-
                        echo -n "${path##*/}: "
                        modload $flags $path
                        rm -f /tmp/lkm.$$