summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-12-27 19:26:39 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-12-27 19:26:39 +0000
commit76612f46259bdcdaa526b4546b39c7d64d406450 (patch)
tree01f6eb75c6d041f87c155208e8b0d978c2980f6f
parentec9f26f2a6519520a12138ee2b36f2081d40a95b (diff)
downloadpfsense-76612f46259bdcdaa526b4546b39c7d64d406450.zip
pfsense-76612f46259bdcdaa526b4546b39c7d64d406450.tar.gz
Loop assign interfaces option until the user gets the correct configuraiton.
Ticket #749
-rw-r--r--etc/inc/config.inc2
-rwxr-xr-xetc/rc.bootup2
2 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 7bc543d..f5ce7c3 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1141,6 +1141,8 @@ EOD;
reload_all_sync();
echo " done!\n";
+
+ touch("{$g['tmp_path']}/assign_complete");
}
}
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 8831bb1..7e06ed2 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -81,7 +81,7 @@
$do_assign = 1;
}
}
- if($do_assign == 1) {
+ if($do_assign == 1 and !file_exists("{$g['tmp_path']}/assign_complete")) {
$noreboot = true;
echo " -- Running interface assignment option.\n";
set_networking_interfaces_ports();
OpenPOWER on IntegriCloud