Updated FAI partition handling

[gosa.git] / gosa-plugins / fai / admin / fai / class_faiPartitionTable.inc

diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
index 3b44c41e3a52e7731bc2acd20df5dc55bb81207e..9534a765e1afef84ca18981a5b89c3b45e717139 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
@@ -8,7 +8,7 @@ class faiPartitionTable extends plugin
   var $objectclasses    = array("top","FAIclass","FAIpartitionTable");
 
   var $subAttributes      = array("cn","description");
-  var $subPartAttributes  = array("cn","FAIpartitionNr","FAIpartitionSize","FAImountPoint","FAIfsType","FAIpartitionType","FAImountOptions","FAIfsOptions","FAIpartitionFlags","description");
+  var $subPartAttributes  = array("cn","FAIpartitionNr","FAIpartitionSize","FAImountPoint","FAIfsType","FAIpartitionType","FAImountOptions","FAIfsOptions","FAIpartitionFlags","description","FAIfsCreateOptions","FAIfsTuneOptions","FAIfsOptions","FAIpartitionFlags","FAIlvmDevice");
 
   var $sub64coded = array();
   var $subBinary = array();
@@ -135,9 +135,9 @@ class faiPartitionTable extends plugin
         if(isset($_POST['AddDisk'])) $type = "disk";
         if(isset($_POST['AddRaid'])) $type = "raid";
         if(isset($_POST['AddAddVolgroup'])) $type = "lvm";
-        $this->dialog = new faiDiskEntry($this->config,$this->dn,$usedDiskNames, array(),$type); 
+        $this->dialog = new faiDiskEntry($this->config,$this->dn,$this, array(),$type); 
       } else {
-        $this->dialog = new faiPartitionTableEntry($this->config,$this->dn,$usedDiskNames); 
+        $this->dialog = new faiPartitionTableEntry($this->config,$this->dn,$this); 
       }
 
       $this->dialog->set_acl_base($this->acl_base_for_current_object($this->dn));
@@ -264,7 +264,7 @@ class faiPartitionTable extends plugin
             case 'lvm': 
             case 'disk': 
               $this->dialog = new faiDiskEntry(
-                  $this->config,$this->dn,$usedDiskNames,$this->disks[$Udisk], 
+                  $this->config,$this->dn,$this,$this->disks[$Udisk], 
                   $this->disks[$Udisk]['FAIdiskType']); 
               break;
             case 'old': 
@@ -545,6 +545,12 @@ class faiPartitionTable extends plugin
       if(isset($disk['FAIdiskType'])){
         $disk_attrs['FAIdiskType']  =  $disk['FAIdiskType']; 
       }
+      if(isset($disk['FAIdiskOption'])){
+        $disk_attrs['FAIdiskOption']  =  $disk['FAIdiskOption']; 
+      }
+      if(isset($disk['FAIlvmDevice'])){
+        $disk_attrs['FAIlvmDevice']  =  $disk['FAIlvmDevice']; 
+      }
 
       if(empty($disk_attrs['description']) && $disk['status'] == "edited"){
         $disk_attrs['description'] = array();
@@ -574,6 +580,7 @@ class faiPartitionTable extends plugin
       }
 
       if($disk['status']!="delete")
+
       /* Add all partitions */
       foreach($disk['partitions'] as $key => $partition){
         $partition_attrs = array();