diff options
| author | sheldonh <sheldonh@FreeBSD.org> | 2000-08-18 08:07:02 +0000 |
|---|---|---|
| committer | sheldonh <sheldonh@FreeBSD.org> | 2000-08-18 08:07:02 +0000 |
| commit | 4332565227b534826127dccbdef1200139b1738b (patch) | |
| tree | 65ecf2a31d463f2263353b742cda122894a83dd2 /etc | |
| parent | 700f78e35497ab0b08d4f4d54d66cfa6335871cc (diff) | |
| download | FreeBSD-src-4332565227b534826127dccbdef1200139b1738b.zip FreeBSD-src-4332565227b534826127dccbdef1200139b1738b.tar.gz | |
Don't rely on a shell scripts to do the simple job of loading
kernel modules for ibcs2_enable and svr4_enable.
Don't rely on a shell script to do the neglibly less simple
job of loading a kernel module and running one command for
linux_enable.
These shell scripts are going away.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/etc.amd64/rc.amd64 | 13 | ||||
| -rw-r--r-- | etc/etc.i386/rc.i386 | 13 | ||||
| -rw-r--r-- | etc/rc | 10 |
3 files changed, 30 insertions, 6 deletions
diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64 index a17ccaa..7f3e0d1 100644 --- a/etc/etc.amd64/rc.amd64 +++ b/etc/etc.amd64/rc.amd64 @@ -31,8 +31,17 @@ esac # case ${ibcs2_enable} in [Yy][Ee][Ss]) - echo -n ' ibcs2'; ibcs2 > /dev/null 2>&1 - ;; + echo -n ' ibcs2' + kldload ibcs2 > /dev/null 2>&1 + case ${ibcs2_loaders} in + [Nn][Oo]) + ;; + *) + for i in ${ibcs2_loaders}; do + kldload ibcs2_$i > /dev/null 2>&1 + done + ;; + esac esac case ${xtend_enable} in diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386 index a17ccaa..7f3e0d1 100644 --- a/etc/etc.i386/rc.i386 +++ b/etc/etc.i386/rc.i386 @@ -31,8 +31,17 @@ esac # case ${ibcs2_enable} in [Yy][Ee][Ss]) - echo -n ' ibcs2'; ibcs2 > /dev/null 2>&1 - ;; + echo -n ' ibcs2' + kldload ibcs2 > /dev/null 2>&1 + case ${ibcs2_loaders} in + [Nn][Oo]) + ;; + *) + for i in ${ibcs2_loaders}; do + kldload ibcs2_$i > /dev/null 2>&1 + done + ;; + esac esac case ${xtend_enable} in @@ -548,7 +548,13 @@ fi # case ${linux_enable} in [Yy][Ee][Ss]) - echo -n ' linux'; linux > /dev/null 2>&1 + echo -n ' linux' + if ! kldstat -v | grep -E 'linux(aout|elf)' > /dev/null; then + kldload linux > /dev/null 2>&1 + fi + if [ -x /compat/linux/sbin/ldconfig ]; then + /compat/linux/sbin/ldconfig + fi ;; esac @@ -556,7 +562,7 @@ esac # case ${svr4_enable} in [Yy][Ee][Ss]) - echo -n ' svr4'; svr4 > /dev/null 2>&1 + echo -n ' svr4'; kldload svr4 > /dev/null 2>&1 ;; esac |
