diff --git a/plugins/admin/fai/class_faiPartitionTableEntry.inc b/plugins/admin/fai/class_faiPartitionTableEntry.inc
index 110fa50c35d92663a40203e0ae90149373e4b986..1223d9e598e1ed1245dc188074ac4bfb1225d7d2 100644 (file)
{
/* Define Arrays with allowed syntax */
$PartitionTypes = array("primary"=>_("primary"),"logical"=>_("logical"));
- $FAIfsTypes = array("ext2","ext3","xfs","swap","reiserfs","dosfat16","winfat32");
+ $FAIfsTypes = array("ext2","ext3","xfs","swap","reiser","dosfat16","winfat32");
/* Display Header */
$str = "<table summary='' style='width:100%'>";
$message[]=sprintf(_("please enter a unique mount point for partition %s"),($key));
}
- if($part['FAIfsType']!="swap"){
+ if($part['FAIfsType']!="swap" && $part['FAImountPoint'] != "-"){
if((empty($part['FAImountPoint']))||(!((preg_match("/^\/.*/",$part['FAImountPoint']))||(preg_match("/^swap$/",$part['FAImountPoint']))))){
$message[]=sprintf(_("Please enter a valid mount point for partition %s." ),($key));
}
$message[]= sprintf(_("Please enter a valid partition size for partition %s."),($key));
break;
case 1:
- if (!is_id(is_id($tmp[0]))){
+ if (!is_id(is_id($tmp[0])) &&(!empty($tmp[1]))){
$message[]= sprintf(_("Please enter a valid partition size for partition %s."),($key));
}
break;
case 2:
- if((!is_id($tmp[0]))&&(!is_id($tmp[1]))){
+ if((!is_id($tmp[0]))&&(!is_id($tmp[1])) &&(!empty($tmp[1]))){
$message[]=sprintf(_("Please enter a valid range for partition %s."),($key));
}elseif($tmp[0]>=$tmp[1]){
$message[]=sprintf(_("Please enter a valid range for partition %s."),($key));