From b44a76e7c84a251773b672f694996ee438a9570d Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 23 May 2010 01:38:59 -0400
Subject: Move cpdup to LiveCD INSTALLTYPE

---
 .../backend/functions-extractimage.sh              | 23 ++++++++++++++--------
 PCBSD/pc-sysinstall/backend/parseconfig.sh         |  4 ++--
 PCBSD/pc-sysinstall/examples/pfSense.cfg           |  2 ++
 PCBSD/pc-sysinstall/examples/pfSense.cfg.zfs       |  1 +
 4 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'PCBSD')

diff --git a/PCBSD/pc-sysinstall/backend/functions-extractimage.sh b/PCBSD/pc-sysinstall/backend/functions-extractimage.sh
index de2874f..c0c10ff 100644
--- a/PCBSD/pc-sysinstall/backend/functions-extractimage.sh
+++ b/PCBSD/pc-sysinstall/backend/functions-extractimage.sh
@@ -28,13 +28,6 @@ start_extract_uzip_tar()
   echo_log "pc-sysinstall: Starting Extraction"
 
   case ${PACKAGETYPE} in
-   cpdup) cpdup -vvv -I -o ${INSFILE} ${FSMNT}/${INSFILE} >&1 2>&1
-         if [ "$?" != "0" ]
-         then
-           echo "CPDUP failure occured:" >>${LOGOUT}
-           exit_err "ERROR: Error occurred during cpdup"
-         fi
-         ;;
    uzip) # Start by mounting the uzip image
          MDDEVICE=`mdconfig -a -t vnode -o readonly -f ${INSFILE}`
          mkdir -p ${FSMNT}.uzip
@@ -250,7 +243,21 @@ init_extraction()
     INSFILE="${VAL}" ; export INSFILE
   else
     # If no installFile specified, try our defaults
-    if [ "$INSTALLTYPE" = "FreeBSD" ]
+    if [ "$INSTALLTYPE" = "LiveCD" ]
+	then
+      get_value_from_cfg installComponents
+      if [ ! -z "${VAL}" ]
+      then
+        INSFILE="${VAL}" ; export INSFILE
+      for FILE in INSFILE; do
+        cpdup -vvv -I -o ${FILE} /mnt/${FILE} >&1 2>&1
+         if [ "$?" != "0" ]
+         then
+           echo "CPDUP failure occured:" >>${LOGOUT}
+           exit_err "ERROR: Error occurred during cpdup"
+         fi
+      done
+    else if [ "$INSTALLTYPE" = "FreeBSD" ]
     then
       case $PACKAGETYPE in
          uzip) INSFILE="${FBSD_UZIP_FILE}" ;;
diff --git a/PCBSD/pc-sysinstall/backend/parseconfig.sh b/PCBSD/pc-sysinstall/backend/parseconfig.sh
index c3b55a5..31d43bd 100755
--- a/PCBSD/pc-sysinstall/backend/parseconfig.sh
+++ b/PCBSD/pc-sysinstall/backend/parseconfig.sh
@@ -44,8 +44,8 @@ file_sanity_check "installMode disk0 partition bootManager installType installMe
 check_value installMode "fresh upgrade"
 check_value bootManager "bsd none"
 check_value installType "PCBSD FreeBSD"
-check_value installMedium "dvd usb ftp rsync"
-check_value packageType "cpdup uzip tar rsync split"
+check_value installMedium "dvd usb ftp rsync LiveCD"
+check_value packageType "uzip tar rsync split"
 check_value partition "all ALL s1 s2 s3 s4 free FREE"
 if_check_value_exists mirrorbal "load prefer round-robin split"
 
diff --git a/PCBSD/pc-sysinstall/examples/pfSense.cfg b/PCBSD/pc-sysinstall/examples/pfSense.cfg
index 70c7904..b827d2f 100644
--- a/PCBSD/pc-sysinstall/examples/pfSense.cfg
+++ b/PCBSD/pc-sysinstall/examples/pfSense.cfg
@@ -2,6 +2,8 @@
 
 installMode=fresh
 installInteractive=yes
+installType=FreeBSD
+installMedium=LiveCD
 
 # Set the disk parameters
 disk0=ad0
diff --git a/PCBSD/pc-sysinstall/examples/pfSense.cfg.zfs b/PCBSD/pc-sysinstall/examples/pfSense.cfg.zfs
index 3586b4e..468fb45 100644
--- a/PCBSD/pc-sysinstall/examples/pfSense.cfg.zfs
+++ b/PCBSD/pc-sysinstall/examples/pfSense.cfg.zfs
@@ -2,6 +2,7 @@
 installInteractive=no
 installMode=fresh
 installType=FreeBSD
+installMedium=LiveCD
 packageType=cpdup
 
 # Timezone
-- 
cgit v1.1