[PC-BSD Commits] r2009 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-06-02 14:07:12 -0700 (Mon, 02 Jun 2008)
New Revision: 2009

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Take out nfe / msk from install scripts since they are in kernel now



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2008-06-02 21:06:11 UTC (rev 2008)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2008-06-02 21:07:12 UTC (rev 2009)
@@ -99,23 +99,7 @@
 
 done
 
-# Check if we need to keep the nfe driver loaded
-echo " ${config}" | grep " nfe"  >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
-  cat ${FSMNT}/boot/loader.conf | grep -v "if_nfe" > ${FSMNT}/tmp/loader.new
-  mv ${FSMNT}/tmp/loader.new ${FSMNT}/boot/loader.conf
-fi
 
-# Check if we need to keep the msk driver loaded
-echo " ${config}" | grep " msk"  >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
-  cat ${FSMNT}/boot/loader.conf | grep -v "if_msk" > ${FSMNT}/tmp/loader.new
-  mv ${FSMNT}/tmp/loader.new ${FSMNT}/boot/loader.conf
-fi
-
-
 # Set the default firewall rules
 echo "#!/bin/sh
 /PCBSD/Scripts/reset-firewall 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-06-02 21:06:11 UTC (rev 2008)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-06-02 21:07:12 UTC (rev 2009)
@@ -88,8 +88,6 @@
 #bitmap_name="/boot/loading-screen.pcx"
 hw.ata.atapi_dma="1"
 autoboot_delay="5"
-if_nfe_load="YES"
-if_msk_load="YES"
 kern.ipc.shmseg=1024
 kern.ipc.shmmni=1024
 legal.intel_iwi.license_ack=1