X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FSectionConfig.pm;h=cc03aeaed638db1a4f6c4a736ade97ea90633649;hp=a6301e262598d0ee7886144ec104cb51301e5b24;hb=fbd10e04e73ae319f1c59f37344a60e9d640fe9d;hpb=d152f8b0ee639fc08138a19fef8653346ed4762b

diff --git a/src/PVE/SectionConfig.pm b/src/PVE/SectionConfig.pm
index a6301e2..cc03aea 100644
--- a/src/PVE/SectionConfig.pm
+++ b/src/PVE/SectionConfig.pm
@@ -51,7 +51,7 @@ sub plugindata {
 }   
 
 sub createSchema {
-    my ($class) = @_;
+    my ($class, $skip_type) = @_;
 
     my $pdata = $class->private();
     my $propertyList = $pdata->{propertyList};
@@ -71,6 +71,8 @@ sub createSchema {
     };
 
     foreach my $p (keys %$propertyList) {
+	next if $skip_type && $p eq 'type';
+
 	if (!$propertyList->{$p}->{optional}) {
 	    $props->{$p} = $propertyList->{$p};
 	    next;
@@ -104,7 +106,7 @@ sub createSchema {
 }
 
 sub updateSchema {
-    my ($class) = @_;
+    my ($class, $single_class) = @_;
 
     my $pdata = $class->private();
     my $propertyList = $pdata->{propertyList};
@@ -112,8 +114,15 @@ sub updateSchema {
 
     my $props = {};
 
+    my $filter_type = $class->type() if $single_class;
+
     foreach my $p (keys %$propertyList) {
 	next if $p eq 'type';
+
+	my $copts = $class->options();
+
+	next if defined($filter_type) && !defined($copts->{$p});
+
 	if (!$propertyList->{$p}->{optional}) {
 	    $props->{$p} = $propertyList->{$p};
 	    next;
@@ -121,7 +130,6 @@ sub updateSchema {
 
 	my $modifyable = 0;
 
-	my $copts = $class->options();
 	$modifyable = 1 if defined($copts->{$p}) && !$copts->{$p}->{fixed};
 
 	foreach my $t (keys %$plugins) {
@@ -251,6 +259,10 @@ sub check_value {
 	}
     }
 
+    if ($ct eq 'boolean' || $ct eq 'integer' || $ct eq 'number') {
+	return $value + 0; # convert to number
+    }
+
     return $value;
 }
 
@@ -267,7 +279,7 @@ sub parse_section_header {
 }
 
 sub format_section_header {
-    my ($class, $type, $sectionId) = @_;
+    my ($class, $type, $sectionId, $scfg, $done_hash) = @_;
 
     return "$type: $sectionId\n";
 }
@@ -436,18 +448,23 @@ sub write_config {
 
 	die "unknown section type '$type'\n" if !$opts;
 
-	my $data = $class->format_section_header($type, $sectionId);
-	if ($scfg->{comment}) {
+	my $done_hash = {};
+
+	my $data = $class->format_section_header($type, $sectionId, $scfg, $done_hash);
+	if ($scfg->{comment} && !$done_hash->{comment}) {
 	    my $k = 'comment';
 	    my $v = $class->encode_value($type, $k, $scfg->{$k});
 	    $data .= &$format_config_line($propertyList->{$k}, $k, $v);
 	}
 
-	$data .= "\tdisable\n" if $scfg->{disable};
+	$data .= "\tdisable\n" if $scfg->{disable} && !$done_hash->{disable};
 
-	my $done_hash = { comment => 1, disable => 1};
+	$done_hash->{comment} = 1;
+	$done_hash->{disable} = 1;
 
-	foreach my $k (keys %$opts) {
+	my @option_keys = sort keys %$opts;
+	foreach my $k (@option_keys) {
+	    next if defined($done_hash->{$k});
 	    next if $opts->{$k}->{optional};
 	    $done_hash->{$k} = 1;
 	    my $v = $scfg->{$k};
@@ -457,7 +474,7 @@ sub write_config {
 	    $data .= &$format_config_line($propertyList->{$k}, $k, $v);
 	}
 
-	foreach my $k (keys %$opts) {
+	foreach my $k (@option_keys) {
 	    next if defined($done_hash->{$k});
 	    my $v = $scfg->{$k};
 	    next if !defined($v);