diff --git a/gosa-plugins/fai/admin/fai/class_faiPartition.inc b/gosa-plugins/fai/admin/fai/class_faiPartition.inc
index dc5220b470bb7dd2d30c471804942150863e9b38..ad553a2348acd2107c0841b3b4bd92271772a260 100644 (file)
var $preserve = false;
var $preserveType = "always";
- var $status = "";
var $raidDevices = array();
// Once we've exceeded the primary partition limit,
{
$this->parent = $parent;
- $this->status = "new";
$this->FAIdiskType = $type;
// Check if we should be able to add primary partitions.
}
}
- $this->status = $object['status'];
-
if($type == "disk" || $type =="lvm"){
/* Prepare size attribute
}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);
"ext4" => _("ext4"),
"reiserfs" => _("reiser fs"),
"xfs" => _("xfs"),
- "btrfs" => _("btrfs"));
+ "btrfs" => _("btrfs"),
+ "-" => "-");
$smarty->assign("partitionTypes", $types);
$smarty->assign("partitionSizeTypes", $partitionSizeTypes);
// Skip ourselves
if($disk['cn'] == $this->parent->DISKcn) continue;
- if($disk['status'] == "delete") continue;
// Add partition from lvm combinations
if($disk['FAIdiskType'] == "lvm"){
foreach($disk['partitions'] as $key => $part){
- if($part['status'] == "delete") continue;
-
// 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);
}
}
}
// check mount point
- if($this->FAIfsType != "swap"){
+ if($this->FAIfsType != "swap" && $this->FAIfsType != "-"){
if(!preg_match("#^/#",$this->FAImountPoint)){
$msgs[] = msgPool::invalid(_("Mount point"));
}
}
$ret['FAIpartitionSize'] = trim($ret['FAIpartitionSize'],",");
}
- $ret['status'] = $this->status;
if($this->FAIfsType == "swap"){
$ret['FAImountPoint'] = "swap";