From 93d9623e0bd770c3f7ae8606bb55d6d1d9429635 Mon Sep 17 00:00:00 2001 From: jim-p Date: Thu, 23 May 2013 13:08:44 -0400 Subject: 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. --- config/systempatches/patches.inc | 2 ++ config/systempatches/systempatches.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'config') 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 @@ None Applies patches supplied by the user to the firewall. System Patches - 0.8 + 0.9 System: Patches /usr/local/pkg/patches.inc -- cgit v1.2.3