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/inc/config.lib.inc | |
| 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/inc/config.lib.inc')
| -rw-r--r-- | etc/inc/config.lib.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index 4d6ca8d..e0f63f6 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -484,7 +484,7 @@ function write_config($desc="Unknown", $backup = true) { if (!safe_write_file("{$g['cf_conf_path']}/config.xml", $xmlconfig, false)) { log_error("WARNING: Config contents could not be save. Could not open file!"); unlock($lockkey); - file_notice("Unable to open {$g['cf_conf_path']}/config.xml for writing in write_config()\n"); + file_notice("config.xml", "Unable to open {$g['cf_conf_path']}/config.xml for writing in write_config()\n"); return -1; } |
