From 987712e851daa17aea839b8d243f10dd5da003f9 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 17 Feb 2016 15:26:41 -0500
Subject: [PATCH] Change ISO image filename to remove "LiveCD" from its name,
 and clean up associated references to LiveCD. Ticket #5895

---
 src/etc/inc/config.console.inc   | 4 ++--
 src/etc/phpshellsessions/gitsync | 2 +-
 tools/builder_common.sh          | 6 +++---
 tools/builder_defaults.sh        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc
index 0d3356e16d..5b88fbd794 100644
--- a/src/etc/inc/config.console.inc
+++ b/src/etc/inc/config.console.inc
@@ -81,7 +81,7 @@ function set_networking_interfaces_ports() {
 	/* Function flow is based on $key and $auto_assign or the lack thereof */
 	$key = null;
 
-	/* Only present auto interface option if running from LiveCD and interface mismatch*/
+	/* Only present auto interface option if running from the installer media and interface mismatch*/
 	if ((preg_match("/cdrom/", $g['platform'])) && is_interface_mismatch()) {
 		$auto_assign = false;
 	}
@@ -107,7 +107,7 @@ EOD;
 	if ($auto_assign) {
 		echo <<<EOD
 
-		!!! LiveCD Detected: Auto Interface Option !!!!
+		!!! Installation Media Detected: Auto Interface Option !!!!
 BEGIN MANUAL CONFIGURATION OR WE WILL PROCEED WITH AUTO CONFIGURATION.
 
 EOD;
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync
index feaf3dd7f2..32722fee43 100644
--- a/src/etc/phpshellsessions/gitsync
+++ b/src/etc/phpshellsessions/gitsync
@@ -230,7 +230,7 @@ if ($branch == "RESTORE" && $g['platform'] == $g['product_name']) {
 	conf_mount_ro();
 	exit();
 } else {
-	$nobackup = true; // do not backup embedded, livecd
+	$nobackup = true; // do not backup embedded
 }
 
 if ($nobackup == false) {
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 996c31ba30..c17296dfc5 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 70ee8d0b1a..f9388dabde 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"}