[PC-BSD Commits] r19590 - pcbsd/branches/9.1/src-sh/pc-thinclient

[svn at pcbsd.org]

Author: kris
Date: 2012-10-03 19:27:31 +0000 (Wed, 03 Oct 2012)
New Revision: 19590

Modified:
   pcbsd/branches/9.1/src-sh/pc-thinclient/pc-thinclient
Log:

MFC the fixes to pc-thinclient



Modified: pcbsd/branches/9.1/src-sh/pc-thinclient/pc-thinclient
===================================================================
--- pcbsd/branches/9.1/src-sh/pc-thinclient/pc-thinclient	2012-10-03 14:24:22 UTC (rev 19589)
+++ pcbsd/branches/9.1/src-sh/pc-thinclient/pc-thinclient	2012-10-03 19:27:31 UTC (rev 19590)
@@ -87,11 +87,13 @@
 	fi
 
 	# Add firewall exception
-	cat /etc/pf.conf | grep "pass in on ${NIC} all" >/dev/null 2>/dev/null
-	if [ "$?" != "0" ] ; then
+        if [ -e "/etc/pf.conf" ] ; then
+	  cat /etc/pf.conf | grep "pass in on ${NIC} all" >/dev/null 2>/dev/null
+	  if [ "$?" != "0" ] ; then
   		# Setup the firewall exclusion for this NIC
   		echo "pass in on ${NIC} all" >> /etc/pf.conf
-	fi
+	  fi
+     	fi
 
 	# Add some entries for /etc/exports
 	cat /etc/exports 2>/dev/null | grep "$PXEWORLD" >/dev/null 2>/dev/null
@@ -115,8 +117,8 @@
 
 	# Add a bulk of IPs to /etc/hosts this fixes bugs with RPC timeouts
 	# when mounting NFS
-	cat /etc/hosts | grep "192.168.2." >/dev/null 2>/dev/null
-	if [ "$?" != "0" ] ; then
+	grep -q 'thinclient100' /etc/hosts
+	if [ $? -ne 0 ] ; then
 		i="100"
 		while
 		z="1"
@@ -242,7 +244,7 @@
   PCBSD_ETCCONF="/usr/local/etc/pcbsd.conf"
 
   # Set the mirror URL
-  MIRRORURL="`cat ${PCBSD_ETCCONF} | grep 'PCBSD_MIRROR: ' | sed 's|PCBSD_MIRROR:||g'`"
+  MIRRORURL="`cat ${PCBSD_ETCCONF} | grep 'PCBSD_MIRROR: ' | sed 's|PCBSD_MIRROR:||g' | tr -d ' '`"
 
   # Set the system arch type
   if [ "$SYSTYPE" = "desktop" ] ; then