diff options
| author | jim-p <jimp@pfsense.org> | 2016-02-17 15:26:41 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2016-02-17 15:27:40 -0500 |
| commit | 987712e851daa17aea839b8d243f10dd5da003f9 (patch) | |
| tree | 4aa6a74d6aaeca43d53bd08040a5d7abe3aee23a /tools | |
| parent | 376e8deb897f0df3a522ffc7ad0dfc6a9fde7fae (diff) | |
| download | pfsense-987712e851daa17aea839b8d243f10dd5da003f9.zip pfsense-987712e851daa17aea839b8d243f10dd5da003f9.tar.gz | |
Change ISO image filename to remove "LiveCD" from its name, and clean up associated references to LiveCD. Ticket #5895
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 6 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 996c31b..c17296d 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -2318,7 +2318,7 @@ snapshots_scp_files() { snapshots_update_status ">>> Copying files to ${RSYNCIP}" # Ensure directory(s) are available - ssh ${RSYNCUSER}@${RSYNCIP} "mkdir -p ${RSYNCPATH}/livecd_installer" + ssh ${RSYNCUSER}@${RSYNCIP} "mkdir -p ${RSYNCPATH}/installer" ssh ${RSYNCUSER}@${RSYNCIP} "mkdir -p ${RSYNCPATH}/updates" ssh ${RSYNCUSER}@${RSYNCIP} "mkdir -p ${RSYNCPATH}/nanobsd" if [ -d $STAGINGAREA/virtualization ]; then @@ -2328,9 +2328,9 @@ snapshots_scp_files() { # ensure permissions are correct for r+w ssh ${RSYNCUSER}@${RSYNCIP} "chmod -R ug+rw ${RSYNCPATH}/." rsync $RSYNC_COPY_ARGUMENTS $STAGINGAREA/${PRODUCT_NAME}-*iso* \ - ${RSYNCUSER}@${RSYNCIP}:${RSYNCPATH}/livecd_installer/ + ${RSYNCUSER}@${RSYNCIP}:${RSYNCPATH}/installer/ rsync $RSYNC_COPY_ARGUMENTS $STAGINGAREA/${PRODUCT_NAME}-memstick* \ - ${RSYNCUSER}@${RSYNCIP}:${RSYNCPATH}/livecd_installer/ + ${RSYNCUSER}@${RSYNCIP}:${RSYNCPATH}/installer/ rsync $RSYNC_COPY_ARGUMENTS $STAGINGAREA/${PRODUCT_NAME}-*Update* \ ${RSYNCUSER}@${RSYNCIP}:${RSYNCPATH}/updates/ rsync $RSYNC_COPY_ARGUMENTS $STAGINGAREA/nanobsd/* \ diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 70ee8d0..f9388da 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -329,7 +329,7 @@ export PRODUCT_SHARE_DIR=${PRODUCT_SHARE_DIR:-"/usr/local/share/${PRODUCT_NAME}" # General builder output filenames export UPDATESDIR=${UPDATESDIR:-"${IMAGES_FINAL_DIR}/updates"} -export ISOPATH=${ISOPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-LiveCD-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.iso"} +export ISOPATH=${ISOPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.iso"} export MEMSTICKPATH=${MEMSTICKPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.img"} export MEMSTICKSERIALPATH=${MEMSTICKSERIALPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-serial-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.img"} export MEMSTICKADIPATH=${MEMSTICKADIPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-ADI-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.img"} |
