diff options
Diffstat (limited to 'src/etc/inc/config.lib.inc')
-rw-r--r-- | src/etc/inc/config.lib.inc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 09e6730..bead760 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -624,22 +624,24 @@ function write_config($desc="Unknown", $backup = true, $write_config_only = fals function reset_factory_defaults($lock = false, $reboot_required = true) { global $g; - /* Remove all additional packages */ + conf_mount_rw(); - mwexec("/bin/sh /usr/local/sbin/{$g['product_name']}-upgrade -r ALL_PACKAGES"); + /* Remove all additional packages */ + mwexec("/bin/sh /usr/local/sbin/{$g['product_name']}-upgrade " . + "-r ALL_PACKAGES"); - conf_mount_rw(); if (!$lock) { $lockkey = lock('config', LOCK_EX); } /* create conf directory, if necessary */ - safe_mkdir("{$g['cf_conf_path']}"); + safe_mkdir($g['cf_conf_path']); /* clear out /conf */ $dh = opendir($g['conf_path']); while ($filename = readdir($dh)) { - if (($filename != ".") && ($filename != "..") && (!is_dir($g['conf_path'] . "/" . $filename))) { + if (($filename != ".") && ($filename != "..") && + (!is_dir($g['conf_path'] . "/" . $filename))) { unlink_if_exists($g['conf_path'] . "/" . $filename); } } @@ -647,7 +649,8 @@ function reset_factory_defaults($lock = false, $reboot_required = true) { unlink_if_exists($g['tmp_path'] . "/config.cache"); /* copy default configuration */ - copy("{$g['conf_default_path']}/config.xml", "{$g['conf_path']}/config.xml"); + copy("{$g['conf_default_path']}/config.xml", + "{$g['cf_conf_path']}/config.xml"); disable_security_checks(); |