[PC-BSD Commits] r5632 - pcbsd-projects/warden8/scripts/backend

[svn at pcbsd.org]

Author: kris
Date: 2009-12-16 09:24:26 -0800 (Wed, 16 Dec 2009)
New Revision: 5632

Modified:
   pcbsd-projects/warden8/scripts/backend/exportjail.sh
   pcbsd-projects/warden8/scripts/backend/importjail.sh
   pcbsd-projects/warden8/scripts/backend/installinmate.sh
   pcbsd-projects/warden8/scripts/backend/mkinmate.sh
Log:

Updated warden for PC-BSD 8 to use new lzma flags



Modified: pcbsd-projects/warden8/scripts/backend/exportjail.sh
===================================================================
--- pcbsd-projects/warden8/scripts/backend/exportjail.sh	2009-12-16 17:14:49 UTC (rev 5631)
+++ pcbsd-projects/warden8/scripts/backend/exportjail.sh	2009-12-16 17:24:26 UTC (rev 5632)
@@ -51,7 +51,7 @@
 
 
 echo "Creating compressed archive of ${IP}... Please Wait..." >&1
-tar cvf - . 2>${WTMP}/${IP}.files | ${PROGDIR}/bin/lzma -si e "${WTMP}/${IP}.lzma" 2>/dev/null
+tar cvf - . 2>${WTMP}/${IP}.files | ${PROGDIR}/bin/lzma -z -c "${WTMP}/${IP}.lzma" 2>/dev/null
 
 
 cd ${WTMP}

Modified: pcbsd-projects/warden8/scripts/backend/importjail.sh
===================================================================
--- pcbsd-projects/warden8/scripts/backend/importjail.sh	2009-12-16 17:14:49 UTC (rev 5631)
+++ pcbsd-projects/warden8/scripts/backend/importjail.sh	2009-12-16 17:24:26 UTC (rev 5632)
@@ -150,7 +150,7 @@
 mkdir -p "${JDIR}/${IP}"
 
 # Extract the jail contents
-tail +${SKIP} ${IFILE} | lzma -so -si d 2>/dev/null | tar xpf - -C "${JDIR}/${IP}" 2>/dev/null
+tail +${SKIP} ${IFILE} | lzma -d -c - 2>/dev/null | tar xpf - -C "${JDIR}/${IP}" 2>/dev/null
 
 # Make sure we have an IP address saved
 echo "${IP}" >"${JDIR}/${IP}/etc/.wardenip"

Modified: pcbsd-projects/warden8/scripts/backend/installinmate.sh
===================================================================
--- pcbsd-projects/warden8/scripts/backend/installinmate.sh	2009-12-16 17:14:49 UTC (rev 5631)
+++ pcbsd-projects/warden8/scripts/backend/installinmate.sh	2009-12-16 17:24:26 UTC (rev 5632)
@@ -106,7 +106,7 @@
 mkdir -p "${JDIR}/${IP}/.tmp.$$"
 
 # Extract the inmate contents
-tail +${SKIP} ${IFILE} | lzma -so -si d 2>/dev/null | tar xpf - -C "${JDIR}/${IP}/.tmp.$$" 2>/dev/null
+tail +${SKIP} ${IFILE} | lzma -d -c - 2>/dev/null | tar xpf - -C "${JDIR}/${IP}/.tmp.$$" 2>/dev/null
 
 # Export our varibles for the scripts  
 IDIR="/.tmp.$$" ; export IDIR

Modified: pcbsd-projects/warden8/scripts/backend/mkinmate.sh
===================================================================
--- pcbsd-projects/warden8/scripts/backend/mkinmate.sh	2009-12-16 17:14:49 UTC (rev 5631)
+++ pcbsd-projects/warden8/scripts/backend/mkinmate.sh	2009-12-16 17:24:26 UTC (rev 5632)
@@ -115,7 +115,7 @@
 ___INMATE_START___" > .spacer
 
 # Create the lzma of the package
-tar cvf - -C ${IDIR} . 2>/dev/null | ${PROGDIR}/bin/lzma -si e "pkg.lzma" 2>/dev/null
+tar cvf - -C ${IDIR} . 2>/dev/null | ${PROGDIR}/bin/lzma -z -c "pkg.lzma" 2>/dev/null
 
 # Make the .wit file now
 cat header.tgz .spacer pkg.lzma > ../${FNAME}${FVER}.wit