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

[svn at pcbsd.org]

Author: kris
Date: 2008-07-29 06:15:33 -0700 (Tue, 29 Jul 2008)
New Revision: 2471

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

Updated our other relevant scripts to use our new FETCHCMD variable



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DesktopSetup.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DesktopSetup.sh	2008-07-29 13:13:29 UTC (rev 2470)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.DesktopSetup.sh	2008-07-29 13:15:33 UTC (rev 2471)
@@ -8,8 +8,17 @@
 # Load Wine from CD2 here
 DISPLAY=""; export DISPLAY
 mkdir -p ${FSMNT}/tmp/components
-cp ${CDMNT}/PBI/Wine* ${FSMNT}/tmp/components/
 
+# If we are on a network connection
+if [ -e "/tmp/networkURL" ]
+then
+  cd ${FSMNT}/tmp/components
+  ${FETCHCMD} ${NETPATH}/PBI/${WINEPBI}
+else
+  cp ${CDMNT}/PBI/${WINEPBI} ${FSMNT}/tmp/components/
+fi
+
+
 # Make our install script
 echo '#!/bin/sh
 ls /Programs/Wine* >/dev/null 2>/dev/null

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD1.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD1.sh	2008-07-29 13:13:29 UTC (rev 2470)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD1.sh	2008-07-29 13:15:33 UTC (rev 2471)
@@ -17,8 +17,7 @@
 if [ -e "/tmp/networkURL" ]
 then
   # Pull image from network
-  NETPATH="`cat /tmp/networkURL`"
-  fetch -o - ${NETPATH}/PCBSD.tar.lzma 2>/dev/null | ${LZMA_CMD} | tar -xpvf - >&1 2>&1
+  ${FETCHCMD} -o - ${NETPATH}/PCBSD.tar.lzma 2>/dev/null | ${LZMA_CMD} | tar -xpvf - >&1 2>&1
   if [ "$?" != "0" ]
   then
     exit 1

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh	2008-07-29 13:13:29 UTC (rev 2470)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallCD2.sh	2008-07-29 13:15:33 UTC (rev 2471)
@@ -18,8 +18,7 @@
 
 if [ -e "/tmp/networkURL" ]
 then
-  NETPATH="`cat /tmp/networkURL`"
-  fetch -o - ${NETPATH}/PCBSD2.tar.lzma 2>/dev/null | ${LZMA_CMD} | tar -xpvf - >&1 2>&1
+  ${FETCHCMD} -o - ${NETPATH}/PCBSD2.tar.lzma 2>/dev/null | ${LZMA_CMD} | tar -xpvf - >&1 2>&1
   if [ "$?" != "0" ]
   then
     exit 1

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-29 13:13:29 UTC (rev 2470)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-29 13:15:33 UTC (rev 2471)
@@ -210,15 +210,13 @@
 
 umount -f ${FSMNT} >/dev/null
 
-#  Start resetting all the ZFS partition mountpoints if we need to
-if [ -e "/uzip/ZFS-root" ]
+# If we are not using a network URL, unmount the CD
+if [ ! -e "/tmp/networkURL" ]
 then
+  umount ${CDMNT}
+  /usr/sbin/cdcontrol -f `cat /tmp/cdmnt` eject
 fi
 
-
-umount ${CDMNT}
-/usr/sbin/cdcontrol -f `cat /tmp/cdmnt` eject
-
 # If we need to stamp the BSD boot-loader, do it
 if [ -e "/tmp/StampBoot.sh" ]
 then