diff options
| author | imp <imp@FreeBSD.org> | 2010-08-19 06:02:31 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-08-19 06:02:31 +0000 |
| commit | e2d4a5a85f565d5d5a6b1e0ccd682f0d79e0d8a2 (patch) | |
| tree | b3fc9a63f79b12e75989eece42d8f1146f1dde1f /usr.sbin/pc-sysinstall/backend/functions-extractimage.sh | |
| parent | bc2b00ae354e3bf5e5d2bd85ca560e795b337a4f (diff) | |
| download | FreeBSD-src-e2d4a5a85f565d5d5a6b1e0ccd682f0d79e0d8a2.zip FreeBSD-src-e2d4a5a85f565d5d5a6b1e0ccd682f0d79e0d8a2.tar.gz | |
Some cleanup, changed some echo's to echo_log, check for PROGDIR so
that different PROGDIR's can be set.
PR: 148806
Submitted by: John Hixson
Diffstat (limited to 'usr.sbin/pc-sysinstall/backend/functions-extractimage.sh')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions-extractimage.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh b/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh index de86711..54a742b 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh @@ -123,7 +123,7 @@ start_extract_split() cd "${dir}" if [ -f "install.sh" ] then - echo "Extracting" `basename ${dir}` + echo_log "Extracting" `basename ${dir}` echo "y" | sh install.sh >/dev/null if [ "$?" != "0" ] then @@ -139,7 +139,7 @@ start_extract_split() cd "${KERNELS}" if [ -f "install.sh" ] then - echo "Extracting" `basename ${KERNELS}` + echo_log "Extracting" `basename ${KERNELS}` echo "y" | sh install.sh generic >/dev/null if [ "$?" != "0" ] then @@ -155,7 +155,7 @@ start_extract_split() cd "${SOURCE}" if [ -f "install.sh" ] then - echo "Extracting" `basename ${SOURCE}` + echo_log "Extracting" `basename ${SOURCE}` echo "y" | sh install.sh all >/dev/null if [ "$?" != "0" ] then @@ -259,8 +259,8 @@ bye EOF - # Fetch the files via ftp - echo "$ INSTALL" | ftp -N "${NETRC}" "${FTPHOST}" + # Fetch the files via ftp + echo "$ INSTALL" | ftp -N "${NETRC}" "${FTPHOST}" # Done fetching, now reset the INSFILE to our downloaded archived INSFILE="${OUTFILE}" ; export INSFILE |
