[PC-BSD Commits] r5161 - in pcbsd/trunk/pc-sysinstall: . backend-query conf

[svn at pcbsd.org]

Author: kris
Date: 2009-11-30 06:22:23 -0800 (Mon, 30 Nov 2009)
New Revision: 5161

Modified:
   pcbsd/trunk/pc-sysinstall/backend-query/enable-net.sh
   pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf
   pcbsd/trunk/pc-sysinstall/pc-sysinstall
Log:

Added flag to enable-net which will fetch a mirror listing on demand



Modified: pcbsd/trunk/pc-sysinstall/backend-query/enable-net.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend-query/enable-net.sh	2009-11-30 14:09:27 UTC (rev 5160)
+++ pcbsd/trunk/pc-sysinstall/backend-query/enable-net.sh	2009-11-30 14:22:23 UTC (rev 5161)
@@ -3,6 +3,7 @@
 ###########################################################################
 
 . ${PROGDIR}/backend/functions.sh
+. ${PROGDIR}/conf/pc-sysinstall.conf
 . ${BACKEND}/functions-networking.sh
 . ${BACKEND}/functions-parse.sh
 
@@ -12,6 +13,7 @@
 NETMASK="$3"
 DNS="$4"
 GATEWAY="$5"
+MIRRORFETCH="$6"
 
 if [ -z "${NIC}" ]
 then
@@ -30,3 +32,8 @@
 
   route add default ${GATE}
 fi
+
+case ${MIRRORFETCH} in
+   ON|on|yes|YES) curl -o /tmp/mirrors-list.txt ${MIRRORLIST} >/dev/null 2>/dev/null;;
+   *) ;;
+esac

Modified: pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf
===================================================================
--- pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf	2009-11-30 14:09:27 UTC (rev 5160)
+++ pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf	2009-11-30 14:22:23 UTC (rev 5161)
@@ -62,5 +62,5 @@
 # Our internet mirror listing file location
 NETSERVER="http://updates.pcbsd.org"
 ARCH="`uname -m`"
-#VERSION="`cat /PCBSDVERSION`"
+VERSION="`cat /PCBSDVERSION`"
 MIRRORLIST="${NETSERVER}/mirrors-netinstall.php?ver=${VERSION}&arch=${ARCH}"

Modified: pcbsd/trunk/pc-sysinstall/pc-sysinstall
===================================================================
--- pcbsd/trunk/pc-sysinstall/pc-sysinstall	2009-11-30 14:09:27 UTC (rev 5160)
+++ pcbsd/trunk/pc-sysinstall/pc-sysinstall	2009-11-30 14:22:23 UTC (rev 5161)
@@ -140,7 +140,7 @@
   ;;
 
   # Function allows the setting of networking by a calling front-end
-  enable-net) ${QUERYDIR}/enable-net.sh "${2}" "${3}" "${4}" "${5}" "${6}"
+  enable-net) ${QUERYDIR}/enable-net.sh "${2}" "${3}" "${4}" "${5}" "${6}" "${7}"
   ;;
 
   # Function which lists available backups on a rsync/ssh server