diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-23 19:25:20 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-23 19:25:20 -0400 |
| commit | 6a1dc3a79459a5ba917e77c297b3c98599fd1af6 (patch) | |
| tree | 748d3a5deccd741cc3833e5d4883018552cad455 /config/systempatches/patches.inc | |
| parent | f362732e77b071e78c249d2e0d5b46387411d52e (diff) | |
| parent | 3203270cc58d6f0a5aa5ff586efc524fb13d12da (diff) | |
| download | pfsense-packages-6a1dc3a79459a5ba917e77c297b3c98599fd1af6.tar.gz pfsense-packages-6a1dc3a79459a5ba917e77c297b3c98599fd1af6.tar.bz2 pfsense-packages-6a1dc3a79459a5ba917e77c297b3c98599fd1af6.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/systempatches/patches.inc')
| -rw-r--r-- | config/systempatches/patches.inc | 2 |
1 files changed, 2 insertions, 0 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; } |