From ee298a81514f6a180125111af46b51a5953c551b Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sun, 8 Sep 2002 23:59:38 +0000 Subject: [PATCH] Back out last commit where I moved pcn(4) off of the modules floppy back into the install kernel. Unfortunately pcn(4) also needs mii(4) so that would also have to added to install kernel, which will bloat it up so that it doesn't fit on the floppy any more. Turns out we grew a lnc(4) module since I last looked. So handle it as a kld loadable module during install rather than have it statically compiled into the kernel. --- release/amd64/dokern.sh | 2 ++ release/i386/dokern.sh | 2 ++ release/i386/drivers.conf | 2 ++ release/pc98/dokern.sh | 2 ++ 4 files changed, 8 insertions(+) diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh index d4754fcf231f..af88420ee4da 100755 --- a/release/amd64/dokern.sh +++ b/release/amd64/dokern.sh @@ -55,6 +55,7 @@ sed -e '/ pty /d' \ -e '/ vx /d' \ -e '/ dc /d' \ -e '/ fxp /d' \ + -e '/ pcn /d' \ -e '/ rl /d' \ -e '/ sf /d' \ -e '/ sis /d' \ @@ -64,6 +65,7 @@ sed -e '/ pty /d' \ -e '/ vr /d' \ -e '/ wb /d' \ -e '/ xl /d' \ + -e '/ lnc /d' \ -e '/ ugen /d' \ -e '/ uhid /d' \ -e '/ ulpt /d' \ diff --git a/release/i386/dokern.sh b/release/i386/dokern.sh index d4754fcf231f..af88420ee4da 100755 --- a/release/i386/dokern.sh +++ b/release/i386/dokern.sh @@ -55,6 +55,7 @@ sed -e '/ pty /d' \ -e '/ vx /d' \ -e '/ dc /d' \ -e '/ fxp /d' \ + -e '/ pcn /d' \ -e '/ rl /d' \ -e '/ sf /d' \ -e '/ sis /d' \ @@ -64,6 +65,7 @@ sed -e '/ pty /d' \ -e '/ vr /d' \ -e '/ wb /d' \ -e '/ xl /d' \ + -e '/ lnc /d' \ -e '/ ugen /d' \ -e '/ uhid /d' \ -e '/ ulpt /d' \ diff --git a/release/i386/drivers.conf b/release/i386/drivers.conf index d605b197effc..23fc28333e10 100644 --- a/release/i386/drivers.conf +++ b/release/i386/drivers.conf @@ -47,6 +47,7 @@ fxp if_fxp 2 network "Intel EtherExpress Pro/100B PCI Fast Ethernet card" kue if_kue 2 network "Kawasaki LSI USB ethernet adapter" lnc if_lnc 2 network "NE2100, NE32-VL Lance Ethernet cards" miibus miibus 2 network "MII bus support" +pcn if_pcn 2 network "AMD Am79c79x PCI ethernet card" rl if_rl 2 network "RealTek 8129/8139 PCI ethernet card" sf if_sf 2 network "Adaptec AIC-6915 PCI ethernet card" sis if_sis 2 network "SiS 900/SiS 7016 PCI ethernet card" @@ -62,6 +63,7 @@ wb if_wb 2 network "Winbond W89C840F PCI ethernet card" wi if_wi 2 network "Lucent WaveLAN/IEEE 802.11 PCMCIA card" xe if_xe 2 network "Xircom pccard ethernet" xl if_xl 2 network "3COM 3c90x / 3c90xB PCI ethernet card" +lnc if_lnc 2 network "NE2100, NE32-VL Lance ethernet card" CD9660 cd9660 2 options "ISO 9660 Filesystem" MSDOSFS msdosfs 3 options "MSDOS filsystem" NFSCLIENT nfsclient 3 options "Network Filesystem Client" diff --git a/release/pc98/dokern.sh b/release/pc98/dokern.sh index d4754fcf231f..af88420ee4da 100755 --- a/release/pc98/dokern.sh +++ b/release/pc98/dokern.sh @@ -55,6 +55,7 @@ sed -e '/ pty /d' \ -e '/ vx /d' \ -e '/ dc /d' \ -e '/ fxp /d' \ + -e '/ pcn /d' \ -e '/ rl /d' \ -e '/ sf /d' \ -e '/ sis /d' \ @@ -64,6 +65,7 @@ sed -e '/ pty /d' \ -e '/ vr /d' \ -e '/ wb /d' \ -e '/ xl /d' \ + -e '/ lnc /d' \ -e '/ ugen /d' \ -e '/ uhid /d' \ -e '/ ulpt /d' \