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 /src | |
| 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 'src')
| -rw-r--r-- | src/etc/inc/config.console.inc | 4 | ||||
| -rw-r--r-- | src/etc/phpshellsessions/gitsync | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc index 0d3356e..5b88fbd 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 feaf3dd..32722fe 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) { |
