diff options
| -rwxr-xr-x | etc/rc.bootup | 5 | ||||
| -rwxr-xr-x | etc/rc.initial.setports | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/etc/rc.bootup b/etc/rc.bootup index 25d71e8..1504269 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -48,7 +48,10 @@ if(does_interface_exist($lan_if) == false) $do_assign = 1; if(does_interface_exist($wan_if) == false) $do_assign = 1; - if($do_assign == 1) system("/etc/rc.initial.setports"); + if($do_assign == 1) { + $noreboot = true; + require("/etc/rc.initial.setports"); + } /* convert configuration, if necessary */ convert_config(); diff --git a/etc/rc.initial.setports b/etc/rc.initial.setports index 0ebabac..a7f8d33 100755 --- a/etc/rc.initial.setports +++ b/etc/rc.initial.setports @@ -229,7 +229,8 @@ pfSense is rebooting now. EOD; - system_reboot_sync(); + if($noreboot <> true) + system_reboot_sync(); } function autodetect_interface($ifname, $fp) { |
