[PC-BSD Commits] r19601 - in pcbsd/branches/9.1/src-sh/pc-thinclient: . resources/scripts

[svn at pcbsd.org]

Author: kris
Date: 2012-10-04 16:48:58 +0000 (Thu, 04 Oct 2012)
New Revision: 19601

Modified:
   pcbsd/branches/9.1/src-sh/pc-thinclient/pc-thinclient
   pcbsd/branches/9.1/src-sh/pc-thinclient/resources/scripts/pc-sysinstall.example
Log:

MFC files to make pc-thinclient not use the DVD for install archives



Modified: pcbsd/branches/9.1/src-sh/pc-thinclient/pc-thinclient
===================================================================
--- pcbsd/branches/9.1/src-sh/pc-thinclient/pc-thinclient	2012-10-04 16:46:51 UTC (rev 19600)
+++ pcbsd/branches/9.1/src-sh/pc-thinclient/pc-thinclient	2012-10-04 16:48:58 UTC (rev 19601)
@@ -274,9 +274,10 @@
 	exit_err "Failed extracting PC-BSD environment"
   fi
 
-  # Cleanup
-  rm rel.txz
-  rm rel.md5
+  # Save the archive as our example world environment
+  mkdir -p ${PXEWORLD}/installarchive/
+  mv rel.txz ${PXEWORLD}/installarchive/fbsd-release.txz
+  mv rel.md5 ${PXEWORLD}/installarchive/fbsd-release.txz.md5
 }
 
 # Function to check if dhcpd is installed
@@ -296,40 +297,15 @@
 
 # Function which checks and sets up the thinclient as an install server
 check_installdirs() {
-	if [ -e "${PXEWORLD}/installarchive/PCBSD-Server.txz" ]; then
+	if [ -e "${PXEWORLD}/installscripts/pc-sysinstall.example" ]; then
 	   return
 	fi
-	SYSARCH=`uname -m`
 	touch ${PXEWORLD}/etc/installserver
 	mkdir ${PXEWORLD}/installscripts
-	mkdir ${PXEWORLD}/installarchive
 	cp ${PROGDIR}/resources/scripts/pc-sysinstall.example ${PXEWORLD}/installscripts/pc-sysinstall.example
-	echo "zfs_load=\"YES\"" >> ${PXEWORLD}/boot/loader.conf
+	echo "zfs_load=\"YES\"" > ${PXEWORLD}/boot/loader.conf
 	echo "geom_mirror_load=\"YES\"" >> ${PXEWORLD}/boot/loader.conf
 	echo "geom_eli_load=\"YES\"" >> ${PXEWORLD}/boot/loader.conf
-
-	echo "Please insert your PC-BSD DVD to copy install archives"
-	echo "Press ENTER when ready"
-	read tmp
-	sleep 10
-	umount -f /dev/cd0 >/dev/null 2>/dev/null
-	sleep 3
-	mount_cd9660 /dev/cd0 /mnt >/dev/null 2>/dev/null
-	if [ -e "/mnt/dist/PCBSD.txz" ] ; then
-	   echo "Copying archives, please wait..."
-	   cp /mnt/dist/PCBSD* ${PXEWORLD}/installarchive/ 
-	   cp -r /mnt/dist/metapackages ${PXEWORLD}/installarchive/ 
-	   cd ${PXEWORLD}/installarchive
-	   ln -fs PCBSD-Server.txz fbsd-release.tbz
-	   ln -fs PCBSD-Server.txz.count fbsd-release.tbz.count
-	   ln -fs PCBSD-Server.txz.md5 fbsd-release.tbz.count.md5
-	   umount -f /dev/cd0 >/dev/null 2>/dev/null
-	   return
-	fi
-
-	echo "Unable to copy install archives.. You may manually copy the DVD"
-	echo "files to ${PXEWORLD}/installarchive/ at a later time."
-
 }
 
 do_removal() {

Modified: pcbsd/branches/9.1/src-sh/pc-thinclient/resources/scripts/pc-sysinstall.example
===================================================================
--- pcbsd/branches/9.1/src-sh/pc-thinclient/resources/scripts/pc-sysinstall.example	2012-10-04 16:46:51 UTC (rev 19600)
+++ pcbsd/branches/9.1/src-sh/pc-thinclient/resources/scripts/pc-sysinstall.example	2012-10-04 16:48:58 UTC (rev 19601)
@@ -1,8 +1,8 @@
 # Sample configuration file for an installation using pc-sysinstall
 
 installMode=fresh
-installInteractive=yes
-hostname=pcbsdsystem
+installInteractive=no
+hostname=examplesystem
 
 # Set the disk parameters
 disk0=ada0
@@ -13,19 +13,18 @@
 # Setup the disk label
 # All sizes are expressed in MB
 # Avail FS Types, UFS, UFS+S, UFS+J, ZFS, SWAP
+# Size 0 means use the rest of the slice size
 disk0-part=UFS+SUJ 1000 / 
 disk0-part=SWAP 2000 none
 disk0-part=UFS+SUJ 0 /usr
-# Size 0 means use the rest of the slice size
-# Do it now!
 commitDiskLabel
 
 # Set if we are installing via optical, USB, or FTP
 installType=FreeBSD
 installMedium=local
 localPath=/installarchive
-
 packageType=tar
+installFile=fbsd-release.txz
 
 # Set the root pass
 rootPass=root