* moved default values for systems and client into DB-layer

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@847 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 24 insertions, 19 deletions

diff --git a/config-db/OpenSLX/ConfigDB.pm b/config-db/OpenSLX/ConfigDB.pm
index f42da383..e619c660 100644
--- a/config-db/OpenSLX/ConfigDB.pm
+++ b/config-db/OpenSLX/ConfigDB.pm
@@ -406,6 +406,24 @@ sub addSystem
 	my $self = shift;
 	my $valRows = _aref(shift);
 
+	foreach my $valRow (@$valRows) {
+		if (!length($valRow->{kernel})) {
+			$valRow->{kernel} = 'vmlinuz';
+		}
+		if (!length($valRow->{label})) {
+			$valRow->{label} = $valRow->{name};
+		}
+		if (!length($valRow->{ramfs_debug_level})) {
+			$valRow->{ramfs_debug_level} = '0';
+		}
+		if (!length($valRow->{ramfs_use_glibc})) {
+			$valRow->{ramfs_use_glibc} = '0';
+		}
+		if (!length($valRow->{ramfs_use_busybox})) {
+			$valRow->{ramfs_use_busybox} = '1';
+		}
+	}
+
 	return $self->{'meta-db'}->addSystem($valRows);
 }
 
@@ -508,6 +526,12 @@ sub addClient
 	my $self = shift;
 	my $valRows = _aref(shift);
 
+	foreach my $valRow (@$valRows) {
+		if (!length($valRow->{boot_type})) {
+			$valRow->{boot_type} = 'pxe';
+		}
+	}
+
 	return $self->{'meta-db'}->addClient($valRows);
 }
 
diff --git a/config-db/slxconfig b/config-db/slxconfig
index 962ba81b..5b4970a7 100755
--- a/config-db/slxconfig
+++ b/config-db/slxconfig
@@ -279,9 +279,6 @@ sub addClientToConfigDB
 	if ($clientData->{mac} !~ m[^(?:[[:xdigit:]][[:xdigit:]]:){5}?[[:xdigit:]][[:xdigit:]]$]) {
 		die _tr("unknown MAC-format given, expected something like '01:02:03:04:05:06'!\n");
 	}
-	if (!length($clientData->{boot_type})) {
-		$clientData->{boot_type} = 'pxe';
-	}
 
 	if ($openslxDB->fetchClientByFilter({ 'name' => $clientData->{name} })) {
 		die _tr("the client '%s' already exists in the DB, giving up!\n",
@@ -337,22 +334,6 @@ sub addSystemToConfigDB
 		delete $systemData->{clients};
 	}
 
-	if (!length($systemData->{kernel})) {
-		$systemData->{kernel} = 'vmlinuz';
-	}
-	if (!length($systemData->{label})) {
-		$systemData->{label} = "$systemData->{name}";
-	}
-	if (!length($systemData->{ramfs_debug_level})) {
-		$systemData->{ramfs_debug_level} = '0';
-	}
-	if (!length($systemData->{ramfs_use_glibc})) {
-		$systemData->{ramfs_use_glibc} = '0';
-	}
-	if (!length($systemData->{ramfs_use_busybox})) {
-		$systemData->{ramfs_use_busybox} = '1';
-	}
-
 	if ($openslxDB->fetchSystemByFilter({ 'name' => $systemData->{name} })) {
 		die _tr("the system '%s' already exists in the DB, giving up!\n",
 				$systemData->{name});