mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change ISO image filename to remove "LiveCD" from its name, and clean up associated references to LiveCD. Ticket #5895

Browse Source
This commit is contained in:
jim-p 2016-02-17 15:26:41 -05:00
parent 376e8deb89
commit 987712e851
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/inc/config.console.inc
View File

@ -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;

2
src/etc/phpshellsessions/gitsync
View File

@ -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) {

6
tools/builder_common.sh
View File

@ -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/* \

2
tools/builder_defaults.sh
View File

@ -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"}