diff options
| author | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
| commit | d9e2c1714bc55f546702a8660f62e8cff2716aa4 (patch) | |
| tree | 069b2f5369ad4bf9c7e60806b47f5dd42e409c78 /usr/local/www/interfaces_assign.php | |
| parent | 30ade8461e65922c8d8a22d3b9ba5b07bb2912e0 (diff) | |
| parent | c0ed686f9441b7019722954020057b23fe2f6603 (diff) | |
| download | pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.zip pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
usr/local/www/interfaces.php
Not sure why there was a conflict since the last change to this file was May 20.
Diffstat (limited to 'usr/local/www/interfaces_assign.php')
| -rwxr-xr-x | usr/local/www/interfaces_assign.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 3074050..36aa469 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -143,7 +143,7 @@ if (is_array($config['ppps']['ppp']) && count($config['ppps']['ppp'])) { if ($_POST['apply']) { if (file_exists("/var/run/interface_mismatch_reboot_needed")) - exec("/etc/rc.reboot"); + system_reboot(); else { write_config(); |
