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

[svn at pcbsd.org]

Author: kris
Date: 2008-07-29 06:08:52 -0700 (Tue, 29 Jul 2008)
New Revision: 2468

Added:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.TestFetch.sh
Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetNic.sh
Log:

Updated our config file, and network installation scripts



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config	2008-07-29 13:01:42 UTC (rev 2467)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config	2008-07-29 13:08:52 UTC (rev 2468)
@@ -11,10 +11,16 @@
 FC_UZIP="${UZIPDIR}/${UZIP_FILE}"
 LZMA_CMD="lzma -d -c"
 
-# Check if we are on a network connection
+# Our internet mirror listing file location
+NETSERVER="http://updates.pcbsd.org"
+ARCH="`uname -m`"
+VERSION="7"
+MIRRORLIST="${NETSERVER}/mirrors-netinstall.php?ver=${VERSION}&arch=${ARCH}"
+
+# Export our variable if on a network connection
 if [ -e "/tmp/networkURL" ]
 then
-  NETPATH="`cat /tmp/networkURL`" ; export NETPATH
+  NETPATH="`cat /tmp/networkURL`/netinstall/" ; export NETPATH
 fi
 
 # Optional PBIs available on CD/DVD/USB/Network

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetNic.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetNic.sh	2008-07-29 13:01:42 UTC (rev 2467)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetNic.sh	2008-07-29 13:08:52 UTC (rev 2468)
@@ -1,6 +1,10 @@
 #!/bin/sh
 # Script which enables a specified NIC with dhcp or a provided IP 
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
+
 NIC="$1"
 IP="$2"
 NM="$3"
@@ -17,8 +21,7 @@
 sleep 1
 
 # See if we can download a listing of our mirrors
-cd /tmp
-fetch http://updates.pcbsd.org/mirrors-list.txt
+/usr/local/pcbsd/scripts/PCBSD.TestFetch.sh
 
 exit 0
 


Property changes on: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.TestFetch.sh
___________________________________________________________________
Added: svn:executable
   + *