X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2Fclass_faiPartition.inc;h=ad553a2348acd2107c0841b3b4bd92271772a260;hb=9dc6ac611bbe02539e5d9326a6106f8160bc56c3;hp=275a4a12d026f649d5463797b7b9a115ef956821;hpb=abbed328e0ef963d449e3e538a3af2d514d93c1f;p=gosa.git diff --git a/gosa-plugins/fai/admin/fai/class_faiPartition.inc b/gosa-plugins/fai/admin/fai/class_faiPartition.inc index 275a4a12d..ad553a234 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartition.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartition.inc @@ -120,7 +120,7 @@ class faiPartition extends plugin }elseif($type == "raid"){ // Extract raid devices out of the partition size attribute. - $usedDisks = split(",",$this->FAIpartitionSize); + $usedDisks = explode(",",$this->FAIpartitionSize); foreach($usedDisks as $disk){ $name = preg_replace("/:.*$/","",$disk); $spare = preg_match("/:spare/",$disk); @@ -200,7 +200,8 @@ class faiPartition extends plugin "ext4" => _("ext4"), "reiserfs" => _("reiser fs"), "xfs" => _("xfs"), - "btrfs" => _("btrfs")); + "btrfs" => _("btrfs"), + "-" => "-"); $smarty->assign("partitionTypes", $types); $smarty->assign("partitionSizeTypes", $partitionSizeTypes); @@ -250,7 +251,7 @@ class faiPartition extends plugin // Add disks of raid arrays, to the used list. if($disk['FAIdiskType'] == "raid"){ - foreach(split(",",$part['FAIpartitionSize']) as $rDevice){ + foreach(explode(",",$part['FAIpartitionSize']) as $rDevice){ $used[] = preg_replace("/:.*$/i","",$rDevice); } } @@ -408,7 +409,7 @@ class faiPartition extends plugin } // check mount point - if($this->FAIfsType != "swap"){ + if($this->FAIfsType != "swap" && $this->FAIfsType != "-"){ if(!preg_match("#^/#",$this->FAImountPoint)){ $msgs[] = msgPool::invalid(_("Mount point")); }