diff options
| author | gnhb <gnoahb@gmail.com> | 2010-05-12 19:27:12 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-05-12 19:27:12 +0700 |
| commit | 37df6d7b15905be3dd198d9c17f19a1697beea9f (patch) | |
| tree | ef071adda82633630b88de0041b20f757c82bb89 /etc/rc.linkup | |
| parent | 04d36b1f1fdff85cd902b9aa15103b98475b4777 (diff) | |
| parent | e256e9d4d1dedb1418204d2879c7dcf7edcf2137 (diff) | |
| download | pfsense-37df6d7b15905be3dd198d9c17f19a1697beea9f.zip pfsense-37df6d7b15905be3dd198d9c17f19a1697beea9f.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
etc/inc/upgrade_config.inc
Diffstat (limited to 'etc/rc.linkup')
| -rwxr-xr-x | etc/rc.linkup | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/rc.linkup b/etc/rc.linkup index 5f4bf61..59c604e 100755 --- a/etc/rc.linkup +++ b/etc/rc.linkup @@ -63,7 +63,8 @@ function handle_argument_group($iface, $argument2) { } } -if ($g['booting'] == true) { +global $g; +if (file_exists("{$g['varrun_path']}/booting")) { /* ignore all linkup events */ } else { foreach($_SERVER['argv'] as $argv) { |
