diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-01 09:00:09 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-01 09:00:09 -0400 |
| commit | 58005e521346eea230c564aacf34b0820b9a6123 (patch) | |
| tree | 7242c84ccd28d9044a7c0f08f7ecfee952634a65 /etc/inc/system.inc | |
| parent | e5770bc233d9a6a9a335b02490d7c4607410cd95 (diff) | |
| parent | 97c1f2684c5dd225075fec08148f084ff190af0a (diff) | |
| download | pfsense-58005e521346eea230c564aacf34b0820b9a6123.zip pfsense-58005e521346eea230c564aacf34b0820b9a6123.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
conf.default/config.xml
etc/inc/filter.inc
etc/inc/globals.inc
etc/inc/pfsense-utils.inc
etc/inc/upgrade_config.inc
usr/local/www/interfaces.php
Diffstat (limited to 'etc/inc/system.inc')
| -rw-r--r-- | etc/inc/system.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index d88218f..a2f0598 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -116,9 +116,12 @@ function system_resolvconf_generate($dynupdate = false) { } } + $dnslock = lock('resolvconf', LOCK_EX); + $fd = fopen("{$g['varetc_path']}/resolv.conf", "w"); if (!$fd) { printf("Error: cannot open resolv.conf in system_resolvconf_generate().\n"); + unlock($dnslock); return 1; } @@ -148,7 +151,9 @@ function system_resolvconf_generate($dynupdate = false) { } } } - + + unlock($dnslock); + return 0; } @@ -1346,6 +1351,7 @@ function system_reboot_cleanup() { captiveportal_radius_stop_all(); require_once("voucher.inc"); voucher_save_db_to_config(); + mwexec("/etc/rc.stop_packages"); } function system_do_shell_commands($early = 0) { |
