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

[svn at pcbsd.org]

Author: melkor
Date: 2008-05-24 06:47:22 -0700 (Sat, 24 May 2008)
New Revision: 1965

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
Log:

Scripts parametrization


Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config	2008-05-24 13:24:45 UTC (rev 1964)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config	2008-05-24 13:47:22 UTC (rev 1965)
@@ -1,3 +1,11 @@
 
 CDMNT="/cdmnt"
 FSMNT="/mnt"
+UZIPDIR="${CDMNT}/uzip"
+LZMA_FILE="PCBSD.tar.lzma"
+UZIP_FILE="usr.uzip"
+FC_LZMA="${CDMNT}/${LZMA_FILE}"
+FC_UZIP="${UZIPDIR}/${UZIP_FILE}"
+
+
+

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2008-05-24 13:24:45 UTC (rev 1964)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2008-05-24 13:47:22 UTC (rev 1965)
@@ -14,7 +14,7 @@
 LC_CTYPE="" ; export LC_CTYPE
 LC_COLLATE="" ; export LC_COLLATE
 
-lzma -d -c ${CDMNT}/PCBSD.tar.lzma | tar -xpvf - >&1 2>&1
+lzma -d -c ${FC_LZMA} | tar -xpvf - >&1 2>&1
 if [ "$?" != "0" ]
 then
   exit 1

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh	2008-05-24 13:24:45 UTC (rev 1964)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh	2008-05-24 13:47:22 UTC (rev 1965)
@@ -9,7 +9,7 @@
 do
   # Find the CD Device
   /sbin/mount_cd9660 $i ${CDMNT}
-  if [ -e "${CDMNT}/PCBSD.tar.lzma" ]
+  if [ -e "${FC_LZMA}" ]
   then
    FOUND=1
    CDDEV="$i"

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2008-05-24 13:24:45 UTC (rev 1964)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2008-05-24 13:47:22 UTC (rev 1965)
@@ -95,7 +95,7 @@
 LANGOLD="$LANG"
 LANG=""
 
-lzma -d -c ${CDMNT}/PCBSD.tar.lzma  | tar xvp -X /usr/local/pcbsd/scripts/excUpgrade -f - >&1 2>&1
+lzma -d -c ${FC_LZMA}  | tar xvp -X /usr/local/pcbsd/scripts/excUpgrade -f - >&1 2>&1
 
 #Reset LANG
 LANG="$LANGOLD"