diff options
Diffstat (limited to 'PCBSD/pc-sysinstall/backend/functions-extractimage.sh')
| -rw-r--r-- | PCBSD/pc-sysinstall/backend/functions-extractimage.sh | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/PCBSD/pc-sysinstall/backend/functions-extractimage.sh b/PCBSD/pc-sysinstall/backend/functions-extractimage.sh index e07520f..82a0f01 100644 --- a/PCBSD/pc-sysinstall/backend/functions-extractimage.sh +++ b/PCBSD/pc-sysinstall/backend/functions-extractimage.sh @@ -235,6 +235,26 @@ start_rsync_copy() # Entrance function, which starts the installation process init_extraction() { + # Test for LiveCD Type + if [ "$INSTALLTYPE" = "LiveCD" ] + then + get_value_from_cfg cpdupPaths + if [ ! -z "${VAL}" ] + then + INSFILE="${VAL}" ; export INSFILE + fi + for FILE in $INSFILE; do + echo_log "pc-sysinstall: Running cpdup -vvv -I -o /${FILE} /mnt/${FILE}" + /usr/local/bin/cpdup -vvv -I -o /${FILE} /mnt/ >&1 2>&1 + if [ "$?" != "0" ] + then + echo "CPDUP failure occured:" >>${LOGOUT} + exit_err "ERROR: Error occurred during cpdup" + fi + done + return + fi + # Figure out what file we are using to install from via the config get_value_from_cfg installFile @@ -243,22 +263,7 @@ init_extraction() INSFILE="${VAL}" ; export INSFILE else # If no installFile specified, try our defaults - if [ "$INSTALLTYPE" = "LiveCD" ] - then - get_value_from_cfg installComponents - if [ ! -z "${VAL}" ] - then - INSFILE="${VAL}" ; export INSFILE - for FILE in $INSFILE; do - echo_log "pc-sysinstall: Running cpdup -vvv -I -o ${FILE} /mnt/${FILE}" - 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" ] + if [ "$INSTALLTYPE" = "FreeBSD" ] then case $PACKAGETYPE in uzip) INSFILE="${FBSD_UZIP_FILE}" ;; @@ -281,7 +286,9 @@ init_extraction() # Lets start by figuring out what medium we are using case ${INSTALLMEDIUM} in - dvd|usb) # Lets start by mounting the disk + LiveCD) + ;; + dvd|usb) # Lets start by mounting the disk opt_mount if [ ! -z "${INSDIR}" ] then |
