[PC-BSD Commits] r7418 - in pcbsd-projects/warden: . conf scripts/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-08-23 08:03:57 -0700 (Mon, 23 Aug 2010)
New Revision: 7418

Added:
   pcbsd-projects/warden/CHANGELOG
Modified:
   pcbsd-projects/warden/conf/warden.conf
   pcbsd-projects/warden/scripts/backend/exportjail.sh
   pcbsd-projects/warden/scripts/backend/importjail.sh
   pcbsd-projects/warden/scripts/backend/mkinmate.sh
Log:

Updated Warden to 1.1.1, added changelog and fixed number of bugs importing / exporting jails



Modified: pcbsd-projects/warden/conf/warden.conf
===================================================================
--- pcbsd-projects/warden/conf/warden.conf	2010-08-23 13:20:41 UTC (rev 7417)
+++ pcbsd-projects/warden/conf/warden.conf	2010-08-23 15:03:57 UTC (rev 7418)
@@ -39,7 +39,7 @@
 export ATMP
 
 # Warden Version
-WARDENVER="1.1"
+WARDENVER="1.1.1"
 export WARDENVER
 
 # Function to ask the user to press Return to continue

Modified: pcbsd-projects/warden/scripts/backend/exportjail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/exportjail.sh	2010-08-23 13:20:41 UTC (rev 7417)
+++ pcbsd-projects/warden/scripts/backend/exportjail.sh	2010-08-23 15:03:57 UTC (rev 7418)
@@ -51,7 +51,7 @@
 
 
 echo "Creating compressed archive of ${IP}... Please Wait..." >&1
-tar cvf - . 2>${WTMP}/${IP}.files | ${PROGDIR}/bin/lzma -z - >"${WTMP}/${IP}.lzma" #2>/dev/null
+tar cvf - . 2>${WTMP}/${IP}.files | lzma -z - >"${WTMP}/${IP}.lzma" #2>/dev/null
 
 
 cd ${WTMP}

Modified: pcbsd-projects/warden/scripts/backend/importjail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/importjail.sh	2010-08-23 13:20:41 UTC (rev 7417)
+++ pcbsd-projects/warden/scripts/backend/importjail.sh	2010-08-23 15:03:57 UTC (rev 7418)
@@ -45,12 +45,14 @@
 # Lets start importing the jail now
 ######################################################################
 
+
 chk=`echo "${IFILE}" | cut -c 1-1`
 if [ "$chk" != "/" ]
 then
   IFILE="`pwd`/${IFILE}"
 fi
 
+
 # Extract the header info of the file
 cd ${WTMP}
 rm -rf tmp.$$ >/dev/null
@@ -73,6 +75,8 @@
 FIP=""
 FHOST=""
 
+HEADER=`ls *.header`
+
 while read line
 do
   #Check for the file version
@@ -110,7 +114,7 @@
     FHOST="`echo $line | cut -d ' ' -f 2-10`"
   fi
   
-done < *.header
+done < $HEADER 
 
 cd ..
 rm -rf tmp.$$ 2>/dev/null

Modified: pcbsd-projects/warden/scripts/backend/mkinmate.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/mkinmate.sh	2010-08-23 13:20:41 UTC (rev 7417)
+++ pcbsd-projects/warden/scripts/backend/mkinmate.sh	2010-08-23 15:03:57 UTC (rev 7418)
@@ -115,7 +115,7 @@
 ___INMATE_START___" > .spacer
 
 # Create the lzma of the package
-tar cvf - -C ${IDIR} . 2>/dev/null | ${PROGDIR}/bin/lzma -z - >"pkg.lzma" 2>/dev/null
+tar cvf - -C ${IDIR} . 2>/dev/null | lzma -z - >"pkg.lzma" 2>/dev/null
 
 # Make the .wit file now
 cat header.tgz .spacer pkg.lzma > ../${FNAME}${FVER}.wit