Make sure filesystem is rw state when pkg operations are called

1 files changed, 10 insertions, 0 deletions

diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc
index 0501809..e118896 100644
--- a/src/etc/inc/pkg-utils.inc
+++ b/src/etc/inc/pkg-utils.inc
@@ -159,11 +159,14 @@ function pkg_call($params, $mute = false) {
 		2 => array("pipe", "w")	 /* stderr */
 	);
 
+	conf_mount_rw();
+
 	pkg_debug("pkg_call(): {$params}\n");
 	$process = proc_open("/usr/sbin/pkg {$params}", $descriptorspec, $pipes,
 	    '/', pkg_env());
 
 	if (!is_resource($process)) {
+		conf_mount_ro();
 		return false;
 	}
 
@@ -215,6 +218,8 @@ function pkg_call($params, $mute = false) {
 	fclose($pipes[2]);
 	proc_close($process);
 
+	conf_mount_ro();
+
 	if (!isset($rc)) {
 		$rc = $status['exitcode'];
 	}
@@ -252,11 +257,14 @@ function pkg_exec($params, &$stdout, &$stderr) {
 		2 => array("pipe", "w")	 /* stderr */
 	);
 
+	conf_mount_rw();
+
 	pkg_debug("pkg_exec(): {$params}\n");
 	$process = proc_open("/usr/sbin/pkg {$params}", $descriptorspec, $pipes,
 	    '/', pkg_env());
 
 	if (!is_resource($process)) {
+		conf_mount_ro();
 		return -1;
 	}
 
@@ -272,6 +280,8 @@ function pkg_exec($params, &$stdout, &$stderr) {
 	}
 	fclose($pipes[2]);
 
+	conf_mount_ro();
+
 	return proc_close($process);
 }