aboutsummaryrefslogtreecommitdiffstats
path: root/config/systempatches
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-05-23 13:08:44 -0400
committerjim-p <jimp@pfsense.org>2013-05-23 13:10:23 -0400
commit93d9623e0bd770c3f7ae8606bb55d6d1d9429635 (patch)
tree60cbe74ddfbe08fe1e97e0043cf64c7f2f3cee93 /config/systempatches
parent61944b680cd6269aa1a6b57b703084ed19b62fb6 (diff)
downloadpfsense-packages-93d9623e0bd770c3f7ae8606bb55d6d1d9429635.tar.gz
pfsense-packages-93d9623e0bd770c3f7ae8606bb55d6d1d9429635.tar.bz2
pfsense-packages-93d9623e0bd770c3f7ae8606bb55d6d1d9429635.zip
Fix System Patches for NanoBSD (it was missing rw/ro remounts). Bump to 0.9, call it release while we're at it, it's stable, not a beta anymore.
Diffstat (limited to 'config/systempatches')
-rw-r--r--config/systempatches/patches.inc2
-rw-r--r--config/systempatches/systempatches.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/systempatches/patches.inc b/config/systempatches/patches.inc
index 9b347620..0547f2cf 100644
--- a/config/systempatches/patches.inc
+++ b/config/systempatches/patches.inc
@@ -52,12 +52,14 @@ function patch_commit($patch, $action, $test=false, $fulldetail=false) {
$whitespace = isset($patch['ignorewhitespace']) ? "--ignore-whitespace" : "";
$pathstrip = '-p' . $patch['pathstrip'];
$full_patch_command = "{$patch_cmd} --directory={$directory} {$force} {$pathstrip} {$filename} {$check} {$direction} {$whitespace}";
+ conf_mount_rw();
patch_write($patch);
if (!$fulldetail)
$output = (mwexec($full_patch_command, true) == 0);
else
$output = $full_patch_command . "\n\n" . shell_exec($full_patch_command . ' 2>&1');
patch_erase($patch);
+ conf_mount_ro();
return $output;
}
diff --git a/config/systempatches/systempatches.xml b/config/systempatches/systempatches.xml
index ea0eee78..c5e0a784 100644
--- a/config/systempatches/systempatches.xml
+++ b/config/systempatches/systempatches.xml
@@ -40,7 +40,7 @@
<requirements>None</requirements>
<faq>Applies patches supplied by the user to the firewall.</faq>
<name>System Patches</name>
- <version>0.8</version>
+ <version>0.9</version>
<title>System: Patches</title>
<include_file>/usr/local/pkg/patches.inc</include_file>
<menu>