summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@su.local>2009-08-29 18:01:14 -0400
committerScott Ullrich <sullrich@su.local>2009-08-29 18:01:14 -0400
commit00abad24509e60bdc5904becc5c7e678c1007daa (patch)
treebed1014bbf4a1ebb3fd8f09ae511c06755273f83 /etc/inc/config.inc
parent70b139a3e80ab92294ee36942f582d6e514b5482 (diff)
downloadpfsense-00abad24509e60bdc5904becc5c7e678c1007daa.zip
pfsense-00abad24509e60bdc5904becc5c7e678c1007daa.tar.gz
Turn off auto assignment of interfaces code until the author can fix its issues
Diffstat (limited to 'etc/inc/config.inc')
-rw-r--r--etc/inc/config.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 8a48d23..b0720e5 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -797,7 +797,7 @@ function set_networking_interfaces_ports() {
/* Only present auto interface option if running from LiveCD and interface mismatch*/
if ((ereg("cdrom", $g['platform'])) && is_interface_mismatch())
- $auto_assign = true;
+ $auto_assign = false;
echo <<<EOD
@@ -827,11 +827,12 @@ EOD;
echo <<<EOD
-Do you want to set up VLANs first?
+Do you want to set up VLANs first?
+
If you are not going to use VLANs, or only for optional interfaces, you should
say no here and use the webConfigurator to configure VLANs later, if required.
-Do you want to set up VLANs now [y|n]?
+Do you want to set up VLANs now [y|n]?
EOD;
if ($auto_assign) {
@@ -840,7 +841,7 @@ EOD;
} else
$key = chop(fgets($fp));
- if (!isset($key)) { // Auto Assign Interfaces
+ if (!isset($key) and $auto_assign) { // Auto Assign Interfaces
do {
echo <<<EOD
OpenPOWER on IntegriCloud