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

svn at pcbsd.org svn at pcbsd.org
Fri Apr 3 10:08:00 PST 2009


Author: kris
Date: 2009-04-03 11:08:00 -0700 (Fri, 03 Apr 2009)
New Revision: 3752

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

Bit of cleanup relating to doing upgrades again, don't duplicate some settings / files that may already exist on the disk



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2009-04-03 18:04:04 UTC (rev 3751)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2009-04-03 18:08:00 UTC (rev 3752)
@@ -10,9 +10,6 @@
 SETLANG="${LANG}"
 SETKDMLANG="${LANG}"
 
-FILE="*kde-l10n-${LANG}*.tbz"
-
-
 # Setup the presets for the specific lang
 case $LANG in
    af) COUNTRY="C" 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-04-03 18:04:04 UTC (rev 3751)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-04-03 18:08:00 UTC (rev 3752)
@@ -3,7 +3,7 @@
 # Configuration file
 . /usr/local/pcbsd/scripts/PCBSD.Config
 
-LANG="${1}"
+LANG="${1}" ; export LANG
 
 if [ "${1}" = "IGNORE" ]
 then
@@ -22,12 +22,12 @@
 
 if [ "${2}" = "1" ]
 then
+   cat ${FSMNT}/etc/rc.conf | grep -v "bsdstats_" >${FSMNT}/etc/rc.conf.new
+   mv ${FSMNT}/etc/rc.conf.new ${FSMNT}/etc/rc.conf
    echo "bsdstats_enable=\"YES\"" >> ${FSMNT}/etc/rc.conf
 fi
 
 
-# Remove the OpenSSL keys
-rm -f ${FSMNT}/etc/ssh/*key*
 
 # Remove the resolv.conf.save if it exists
 rm -f ${FSMNT}/etc/resolv.conf.save >/dev/null 2>/dev/null
@@ -94,9 +94,16 @@
 echo "" > ${FSMNT}/var/log/cups/error_log
 
 
-# Setup all Network Cards to be DHCP Now
-/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
+# If we are not doing an upgrade, go ahead and detect NICs
+if [ ! -e "/tmp/runningUpgrade" ]
+then
+  # Setup all Network Cards to be DHCP Now
+  /usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
 
+  # Remove the OpenSSL keys
+  rm -f ${FSMNT}/etc/ssh/*key*
+fi
+
 # Touch the wall_cmos_clock file
 touch ${FSMNT}/etc/wall_cmos_clock
 



More information about the Commits mailing list