summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2018-11-14 08:29:34 -0200
committerRenato Botelho <renato@netgate.com>2018-11-14 09:14:09 -0200
commit25e8ca83d1e4bfc58751154ebdfdad375301d64f (patch)
treedc00a121cda8d4f70180102bf8f7d4c534507783 /src
parent9887b24ed803f377b6b7feab3616cedf95b1cb01 (diff)
downloadpfsense-25e8ca83d1e4bfc58751154ebdfdad375301d64f.zip
pfsense-25e8ca83d1e4bfc58751154ebdfdad375301d64f.tar.gz
Simplify logic to remove packages section from backup
Diffstat (limited to 'src')
-rw-r--r--src/usr/local/www/diag_backup.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php
index e52e739..c8ad131 100644
--- a/src/usr/local/www/diag_backup.php
+++ b/src/usr/local/www/diag_backup.php
@@ -179,10 +179,7 @@ if ($_POST) {
$data = backup_config_section($_POST['backuparea']);
$name = "{$_POST['backuparea']}-{$name}";
}
- $sfn = "{$g['tmp_path']}/config.xml.nopkg";
- file_put_contents($sfn, $data);
- exec("sed '/<installedpackages>/,/<\/installedpackages>/d' {$sfn} > {$sfn}-new");
- $data = file_get_contents($sfn . "-new");
+ $data = preg_replace('/\t*<installedpackages>.*<\/installedpackages>\n/sm', '', $data);
} else {
if (!$_POST['backuparea']) {
/* backup entire configuration */
OpenPOWER on IntegriCloud