[PC-BSD Commits] r17334 - pcbsd/current/overlays/install-overlay/etc

[svn at pcbsd.org]

Author: kris
Date: 2012-06-20 13:17:27 +0000 (Wed, 20 Jun 2012)
New Revision: 17334

Modified:
   pcbsd/current/overlays/install-overlay/etc/IntegrityCheck.sh
   pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh
   pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
Log:

Fix some file locations on install media



Modified: pcbsd/current/overlays/install-overlay/etc/IntegrityCheck.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/IntegrityCheck.sh	2012-06-20 13:12:16 UTC (rev 17333)
+++ pcbsd/current/overlays/install-overlay/etc/IntegrityCheck.sh	2012-06-20 13:17:27 UTC (rev 17334)
@@ -8,7 +8,7 @@
 
 echo -e "Checking integrity of uzip filesystem...\c"
 
-/sbin/md5 -q /uzip/usr.uzip | /bin/cmp -s /uzip/usr.uzip.md5 -
+/sbin/md5 -q /uzip/usr.uzip | /usr/bin/cmp -s /uzip/usr.uzip.md5 -
 
 if [ "$?" != "0" ]
 then
@@ -32,13 +32,13 @@
 if [ "$response" != "n" ]
 then
  echo -e "\nChecking integrity of installer archive...\c"
- /sbin/md5 -q ${CHECKFILE}  | /bin/cmp -s ${CHECKFILE}.md5 -
+ /sbin/md5 -q ${CHECKFILE}  | /usr/bin/cmp -s ${CHECKFILE}.md5 -
  if [ "$?" != "0" ]
  then
   echo "FAILED"
   exit 1
  fi
- /sbin/md5 -q ${CHECKFILE2}  | /bin/cmp -s ${CHECKFILE2}.md5 -
+ /sbin/md5 -q ${CHECKFILE2}  | /usr/bin/cmp -s ${CHECKFILE2}.md5 -
  if [ "$?" != "0" ]
  then
   echo "FAILED"

Modified: pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh	2012-06-20 13:12:16 UTC (rev 17333)
+++ pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh	2012-06-20 13:17:27 UTC (rev 17334)
@@ -5,7 +5,7 @@
 echo "Mounting /memfs"
 
 # Do a check of available memory 
-sysMem=`/sbin/sysctl hw.realmem | /bin/cut -d ' ' -f 2`
+sysMem=`/sbin/sysctl hw.realmem | /usr/bin/cut -d ' ' -f 2`
 minSize=`/bin/expr 500 \* 1024 \* 1024`
 if [ $sysMem -lt $minSize ] ; then
   MDSIZE="10"
@@ -18,7 +18,7 @@
 
 else
   # Copy uzip to memory which lets us run faster
-  MDSIZE="`/bin/du -m /uzip/usr.uzip | /bin/cut -f 1`"
+  MDSIZE="`/usr/bin/du -m /uzip/usr.uzip | /usr/bin/cut -f 1`"
   MDSIZE="`/bin/expr ${MDSIZE} + 110`"
   echo "Creating ${MDSIZE}MB ramdisk..."
   /sbin/mdmfs -S -s ${MDSIZE}M -O space md2 /memfs

Modified: pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/SetupLive.sh	2012-06-20 13:12:16 UTC (rev 17333)
+++ pcbsd/current/overlays/install-overlay/etc/SetupLive.sh	2012-06-20 13:17:27 UTC (rev 17334)
@@ -6,7 +6,7 @@
 MEM="`/bin/expr $MEM / 1024`"
 
 # Lets check and see if we have enough RAM to copy the .uzip file
-MDSIZE="`/bin/du -m /PCBSD.ufs.uzip | /bin/cut -f 1`"
+MDSIZE="`/usr/bin/du -m /PCBSD.ufs.uzip | /usr/bin/cut -f 1`"
 MDSIZE="`/bin/expr ${MDSIZE} + 300`"
 MDCHECK="`/bin/expr ${MDSIZE} + 512`"
 if [ $MEM -lt $MDCHECK ]