diff options
| author | jpaetzel <jpaetzel@FreeBSD.org> | 2012-09-06 14:59:53 +0000 |
|---|---|---|
| committer | jpaetzel <jpaetzel@FreeBSD.org> | 2012-09-06 14:59:53 +0000 |
| commit | 2dee4f20c8b8285fadabf7075bec0f4973d189bb (patch) | |
| tree | b865284bbf91e3cdf3bc4e1876387159e528b5a1 /usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh | |
| parent | 2a46ae3db5a3216c95ab197a89cbc84bffed9a12 (diff) | |
| download | FreeBSD-src-2dee4f20c8b8285fadabf7075bec0f4973d189bb.zip FreeBSD-src-2dee4f20c8b8285fadabf7075bec0f4973d189bb.tar.gz | |
Add TRIM support, enabled by default.
Fix a bug installing components from a localPath.
Allow autosizing of any partition, not just the last partition.
Adjust how ZFS is laid out to work with Boot Environments.
Submitted by: kmoore
Obtained from: PC-BSD
MFC after: 3 days
Diffstat (limited to 'usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh b/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh index 05e4d49..f388dd4 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh @@ -71,8 +71,16 @@ copy_component() fetch_file "${FTPPATH}/${COMPFILEDIR}/${SUBDIR}/${CFILE}" "${FSMNT}/${COMPTMPDIR}/${CFILE}" "0" RESULT="$?" ;; - - sftp) ;; + local) + get_value_from_cfg localPath + if [ -z "$VAL" ]; then + exit_err "Install medium was set to local, but no localPath was provided!" + fi + LOCALPATH=$VAL + cp ${LOCALPATH}/${COMPFILEDIR}/${SUBDIR}/${CFILE} \ + ${FSMNT}/${COMPTMPDIR} >>${LOGOUT} 2>>${LOGOUT} + RESULT="$?" + ;; esac if [ "${RESULT}" != "0" ] |
