diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-16 09:34:37 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-16 09:34:37 -0200 |
| commit | 5e8c3fa068f58f1516d0bdcb1def2bdadb09ba43 (patch) | |
| tree | e9d67dc864f463d5ada189384942c87a1c575497 /src/etc/inc/config.lib.inc | |
| parent | caf21e6b67a720be45793a9513b222bff1a660a7 (diff) | |
| download | pfsense-5e8c3fa068f58f1516d0bdcb1def2bdadb09ba43.zip pfsense-5e8c3fa068f58f1516d0bdcb1def2bdadb09ba43.tar.gz | |
Break long lines
Diffstat (limited to 'src/etc/inc/config.lib.inc')
| -rw-r--r-- | src/etc/inc/config.lib.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index d61cf17..8f1f8ff 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -626,7 +626,8 @@ function reset_factory_defaults($lock = false, $reboot_required = true) { /* Remove all additional packages */ - mwexec("/bin/sh /usr/local/sbin/{$g['product_name']}-upgrade -r ALL_PACKAGES"); + mwexec("/bin/sh /usr/local/sbin/{$g['product_name']}-upgrade " . + "-r ALL_PACKAGES"); conf_mount_rw(); if (!$lock) { @@ -634,12 +635,13 @@ function reset_factory_defaults($lock = false, $reboot_required = true) { } /* 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(); |
