[PC-BSD Commits] r17337 - pcbsd/current/overlays/install-overlay/etc
svn at pcbsd.org
svn at pcbsd.org
Wed Jun 20 06:44:09 PDT 2012
Author: kris
Date: 2012-06-20 13:44:09 +0000 (Wed, 20 Jun 2012)
New Revision: 17337
Modified:
pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh
pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh
Log:
Use full path for /bin/cut
Modified: pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh 2012-06-20 13:42:21 UTC (rev 17336)
+++ pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh 2012-06-20 13:44:09 UTC (rev 17337)
@@ -59,7 +59,7 @@
cp /boot/pc-autoinstall.conf /tmp/pc-autoinstall.conf
# Check if the config file is on disk as well
- PCCFG=`grep "pc_config:" /tmp/pc-autoinstall.conf | grep -v "^#" | cut -d ':' -f 2 | tr -d ' '`
+ PCCFG=`grep "pc_config:" /tmp/pc-autoinstall.conf | grep -v "^#" | /bin/cut -d ':' -f 2 | tr -d ' '`
# Check that this isn't a http / ftp file we need to fetch later
echo "${PCCFG}" | grep -e "^http" -e "^ftp" > /dev/null 2>/dev/null
Modified: pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/SetupLive.sh 2012-06-20 13:42:21 UTC (rev 17336)
+++ pcbsd/current/overlays/install-overlay/etc/SetupLive.sh 2012-06-20 13:44:09 UTC (rev 17337)
@@ -1,6 +1,6 @@
#!/bin/sh
-MEM=`sysctl hw.realmem | cut -d " " -f 2`
+MEM=`sysctl hw.realmem | /bin/cut -d " " -f 2`
# Divide a few times to get the size in MB
MEM="`/bin/expr $MEM / 1024`"
MEM="`/bin/expr $MEM / 1024`"
Modified: pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh 2012-06-20 13:42:21 UTC (rev 17336)
+++ pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh 2012-06-20 13:44:09 UTC (rev 17337)
@@ -26,7 +26,7 @@
# If we have a LIVE image, boot with it
if [ -e "/dist/PCBSD.ufs.uzip" ]
then
- MEM=`sysctl hw.realmem | cut -d " " -f 2`
+ MEM=`sysctl hw.realmem | /bin/cut -d " " -f 2`
# We are running in LIVE mode
sh /etc/SetupLive.sh
More information about the Commits
mailing list