From ad893298b2f2e5b99a46fae0dd81c73ab756b04b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Fri, 17 Jun 2011 18:32:28 -0400
Subject: Add new config option cpdupPathsPrefix

---
 usr/sbin/pc-sysinstall/backend/functions-extractimage.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'usr/sbin')

diff --git a/usr/sbin/pc-sysinstall/backend/functions-extractimage.sh b/usr/sbin/pc-sysinstall/backend/functions-extractimage.sh
index 30d13a5..c2d7d55 100755
--- a/usr/sbin/pc-sysinstall/backend/functions-extractimage.sh
+++ b/usr/sbin/pc-sysinstall/backend/functions-extractimage.sh
@@ -405,19 +405,25 @@ init_extraction()
   # Lets start by figuring out what medium we are using
   case ${INSTALLMEDIUM} in
      LiveCD)
+	      get_value_from_cfg cpdupPathsPrefix
+	      if [ ! -z "${VAL}" ]
+			CPDUPPATHPREFIX=""
+	      then
+	        CPDUPPATHPREFIX="${VAL}" ; export CPDUPPATHPREFIX
+	      fi
 	      get_value_from_cfg cpdupPaths
 	      if [ ! -z "${VAL}" ]
 	      then
-	        INSFILE="${VAL}" ; export INSFILE
+	        CPDUPDIR="${VAL}" ; export CPDUPDIR
 	      fi
 		  oIFS=$IFS
 		  IFS=","
-	      for FILE in $INSFILE; do
-	        echo_log "pc-sysinstall: Running cpdup -v -I -o /${FILE} /mnt/${FILE}"
-	        /usr/local/bin/cpdup -vvv -I -o /${FILE} /mnt/${FILE} >&1 2>&1
+	      for FILE in $CPDUPDIR; do
+	        echo_log "pc-sysinstall: Running cpdup -v -I -o ${CPDUPPATHPREFIX}/${FILE} /mnt/${FILE}"
+	        /usr/local/bin/cpdup -v -I -o ${CPDUPPATHPREFIX}/${FILE} /mnt/${FILE} >&1 2>&1
 	         if [ "$?" != "0" ]
 	         then
-	           echo "CPDUP failure occured:" >>${LOGOUT}
+	           echo "CPDUP failure occurred:" >>${LOGOUT}
 	           exit_err "ERROR: Error occurred during cpdup"
 	         fi
 	      done
-- 
cgit v1.1