From 3cc4e9b45f49fb0b1ea9e65c6910adb4a5297423 Mon Sep 17 00:00:00 2001
From: Daniel Stefan Haischt <dsh@pfsense.org>
Date: Thu, 17 Aug 2006 12:11:55 +0000
Subject: bugfixing

---
 packages/freenas/pkg/freenas.inc          |  4 ++++
 packages/freenas/pkg/freenas.xml          | 10 ++++++++++
 packages/freenas/pkg/freenas_services.inc |  4 ++--
 packages/freenas/pkg/freenas_utils.inc    | 13 +++++++++----
 4 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'packages/freenas/pkg')

diff --git a/packages/freenas/pkg/freenas.inc b/packages/freenas/pkg/freenas.inc
index 692a526b..bb0685df 100644
--- a/packages/freenas/pkg/freenas.inc
+++ b/packages/freenas/pkg/freenas.inc
@@ -165,6 +165,10 @@ function oninstall_copy_misc_binaries($action = "install") {
                        "target" => "/usr/sbin/mountd");
    $binaries[] = array("source" => "/usr/local/pkg/rpcbind",
                        "target" => "/usr/sbin/rpcbind");
+   $binaries[] = array("source" => "/usr/local/pkg/rpc.lockd",
+                       "target" => "/usr/sbin/rpc.lockd");
+   $binaries[] = array("source" => "/usr/local/pkg/rpc.lockd",
+                       "target" => "/usr/sbin/rpc.lockd");
                        
    if ($action == "install") {
      while (list(, $val) = each($binaries)) {
diff --git a/packages/freenas/pkg/freenas.xml b/packages/freenas/pkg/freenas.xml
index 1d398eb9..b18d10ff 100644
--- a/packages/freenas/pkg/freenas.xml
+++ b/packages/freenas/pkg/freenas.xml
@@ -385,6 +385,16 @@
     <chmod>0755</chmod>
     <item>http://www.pfsense.com/packages/config/freenas/bin/rpcbind</item>
   </additional_files_needed>
+  <additional_files_needed>
+    <prefix>/usr/local/pkg/</prefix>
+    <chmod>0755</chmod>
+    <item>http://www.pfsense.com/packages/config/freenas/bin/rpc.lockd</item>
+  </additional_files_needed>
+  <additional_files_needed>
+    <prefix>/usr/local/pkg/</prefix>
+    <chmod>0755</chmod>
+    <item>http://www.pfsense.com/packages/config/freenas/bin/rpc.statd</item>
+  </additional_files_needed>
   <!--
     fields gets invoked when the user adds or edits a item. The following items
     will be parsed and rendered for the user as a gui with input, and selectboxes.
diff --git a/packages/freenas/pkg/freenas_services.inc b/packages/freenas/pkg/freenas_services.inc
index 26455f8f..840a03c5 100644
--- a/packages/freenas/pkg/freenas_services.inc
+++ b/packages/freenas/pkg/freenas_services.inc
@@ -397,8 +397,8 @@ function services_nfs_configure() {
 		list($network,$subnet) = 
 		explode('/', $freenas_config['nfs']['nfsnetwork']);
 		
-		$subnet=gen_subnet_mask($subnet);
-		
+		$subnet = gen_subnet_mask($subnet);
+
 		$a_mount = &$freenas_config['mounts']['mount'];
 		
 		foreach ($a_mount as $mount)
diff --git a/packages/freenas/pkg/freenas_utils.inc b/packages/freenas/pkg/freenas_utils.inc
index 12c71a12..d3b1379c 100644
--- a/packages/freenas/pkg/freenas_utils.inc
+++ b/packages/freenas/pkg/freenas_utils.inc
@@ -183,7 +183,7 @@ function get_gmirror_disks_list()
     //        [desc] => COMPLETE
     //        [size] => 6149M
     //    )
-    
+
 
 	/* Display all configured gmirror volume*/
 	exec("/sbin/gmirror list",$rawdata);
@@ -220,7 +220,7 @@ function get_gmirror_disks_list()
 			$founddesc=1;
 			continue ;
 		}
-		
+
 		// Third Step: Getting the array Size
 		// look for this output:
 		// Name: mirror/pouet
@@ -368,7 +368,7 @@ function get_scsi_disks_list()
 			preg_match("/.*\<([^>]*)>.*/",$line,$match);
 		
 			$disklist[$diskname]['desc'] = $match[1];
-			
+
 			/* Looking for the disk size */
 			foreach ($rawdmesg as $dmesgline) 	{			
 					/* Separe la ligne par les espace */
@@ -627,7 +627,7 @@ function freenas_install($src,$dst)
 	while(list(,$val) = each($tableau))
 	{
 		// Si la ligne contient le mot "unused"
-		
+
 		if (ereg ("unused",$val))
 		{
 			// On remplace c: par a:
@@ -672,4 +672,9 @@ function freenas_install($src,$dst)
 	passthru("/bin/rm -rf /mnt/dst");
 
 }
+
+/* Force kill a process by name */
+function forcekillbyname($procname) {
+	return mwexec("/usr/bin/killall -9 " . escapeshellarg($procname));
+}
 ?>
\ No newline at end of file
-- 
cgit v1.2.3