[PC-BSD Commits] r793 - pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2007-10-23 10:49:37 -0700 (Tue, 23 Oct 2007)
New Revision: 793

Modified:
   pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CopyExtra.sh
   pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
   pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh
   pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
Log:

Added LZMA changes to 1.4 branch



Modified: pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CopyExtra.sh
===================================================================
--- pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CopyExtra.sh	2007-10-23 17:47:34 UTC (rev 792)
+++ pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.CopyExtra.sh	2007-10-23 17:49:37 UTC (rev 793)
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Script which copies over a lot of redundant files from the install CD to
-# HD, saving us space in the PCBSD.tbz file
+# HD, saving us space in the PCBSD.tar.lzma file
 ##############################################################################
 
 cd /

Modified: pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
===================================================================
--- pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2007-10-23 17:47:34 UTC (rev 792)
+++ pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2007-10-23 17:49:37 UTC (rev 793)
@@ -12,7 +12,7 @@
 LC_COLLATE="" ; export LC_COLLATE
 
 
-tar xvpj -f /cdmnt/PCBSD.tbz >&1 2>&1
+lzma d -so /cdmnt/PCBSD.tar.lzma 2>/dev/null | tar xvpj -f - >&1 2>&1
 if [ "$?" != "0" ]
 then
   exit 1

Modified: pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh
===================================================================
--- pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh	2007-10-23 17:47:34 UTC (rev 792)
+++ pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountCD.sh	2007-10-23 17:49:37 UTC (rev 793)
@@ -14,7 +14,7 @@
 do
   # Find the CD Device
   /sbin/mount_cd9660 $i /cdmnt
-  if [ -e "/cdmnt/PCBSD.tbz" ]
+  if [ -e "/cdmnt/PCBSD.tar.lzma" ]
   then
    FOUND=1
    CDDEV="$i"

Modified: pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh
===================================================================
--- pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2007-10-23 17:47:34 UTC (rev 792)
+++ pcbsd/branches/1.4/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.MountUpgrade.sh	2007-10-23 17:49:37 UTC (rev 793)
@@ -87,7 +87,7 @@
 LANGOLD="$LANG"
 LANG=""
 
-tar xvpj -X /usr/local/pcbsd/scripts/excUpgrade -f /cdmnt/PCBSD.tbz >&1 2>&1
+lzma d -so /cdmnt/PCBSD.tar.lzma  | tar xvp -X /usr/local/pcbsd/scripts/excUpgrade -f - >&1 2>&1
 
 #Reset LANG
 LANG="$LANGOLD"