[PC-BSD Commits] r6503 - pcbsd-projects/warden/scripts/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-04-05 07:21:18 -0700 (Mon, 05 Apr 2010)
New Revision: 6503

Modified:
   pcbsd-projects/warden/scripts/backend/importjail.sh
   pcbsd-projects/warden/scripts/backend/installinmate.sh
Log:

Fixed a few lzma usage bugs in warden 1.0



Modified: pcbsd-projects/warden/scripts/backend/importjail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/importjail.sh	2010-04-05 14:09:09 UTC (rev 6502)
+++ pcbsd-projects/warden/scripts/backend/importjail.sh	2010-04-05 14:21:18 UTC (rev 6503)
@@ -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/warden/scripts/backend/installinmate.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/installinmate.sh	2010-04-05 14:09:09 UTC (rev 6502)
+++ pcbsd-projects/warden/scripts/backend/installinmate.sh	2010-04-05 14:21:18 UTC (rev 6503)
@@ -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