summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/config.lib.inc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-02-16 09:53:08 -0200
committerRenato Botelho <renato@netgate.com>2016-02-16 09:53:08 -0200
commit961884ae7d6cd4d5d49fe18915345ec88a8c9dfb (patch)
tree901f045db209eeef0d850cd326a7ebc6237e0a6e /src/etc/inc/config.lib.inc
parent1c9fb36e32030befb35acefa018114017e79f6d5 (diff)
downloadpfsense-961884ae7d6cd4d5d49fe18915345ec88a8c9dfb.zip
pfsense-961884ae7d6cd4d5d49fe18915345ec88a8c9dfb.tar.gz
Call conf_mount_rw() before run pfSense-upgrade to avoid doing it twice
Diffstat (limited to 'src/etc/inc/config.lib.inc')
-rw-r--r--src/etc/inc/config.lib.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc
index 8f1f8ff..550f5e4 100644
--- a/src/etc/inc/config.lib.inc
+++ b/src/etc/inc/config.lib.inc
@@ -624,12 +624,12 @@ 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();
+ /* 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);
}
OpenPOWER on IntegriCloud