From 530745cf3fd1c50be2c89a0f101ea8fc5bac2e9a Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Tue, 8 Jan 2008 15:50:42 +0000
Subject: * implemented automatic synchronization of new/changed attributes
 (either   from core or plugins) into the default system * reworked the way
 plugins pass out their attribute info

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1451 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 config-db/OpenSLX/AttrInfo/Core.pm   | 353 ---------------------------------
 config-db/OpenSLX/AttributeRoster.pm | 375 ++++++++++++++++++++++++++++++++---
 config-db/OpenSLX/ConfigDB.pm        |   2 +-
 config-db/OpenSLX/DBSchema.pm        | 172 +++++-----------
 4 files changed, 402 insertions(+), 500 deletions(-)
 delete mode 100644 config-db/OpenSLX/AttrInfo/Core.pm

(limited to 'config-db')

diff --git a/config-db/OpenSLX/AttrInfo/Core.pm b/config-db/OpenSLX/AttrInfo/Core.pm
deleted file mode 100644
index 9716fb34..00000000
--- a/config-db/OpenSLX/AttrInfo/Core.pm
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
-#
-# This program is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your suggestions, praise, or complaints to feedback@openslx.org
-#
-# General information about OpenSLX can be found at http://openslx.org/
-# -----------------------------------------------------------------------------
-# AttrInfo::Core
-#	- provides info about the core attributes.
-# -----------------------------------------------------------------------------
-package OpenSLX::AttrInfo::Core;
-
-use strict;
-use warnings;
-
-use OpenSLX::Utils;
-
-sub new
-{
-	my $class = shift;
-
-	my $self = {
-	};
-
-	return bless $self, $class;
-}
-
-sub AttrInfo
-{
-	return {
-		'automnt_dir' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'automnt_src' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'country' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'dm_allow_shutdown' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'hw_graphic' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'hw_monitor' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'hw_mouse' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'late_dm' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'netbios_workgroup' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'nis_domain' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'nis_servers' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'sane_scanner' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'scratch' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'slxgrp' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_alsasound' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_atd' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_cron' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_dreshal' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_ntp' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_nfsv4' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_printer' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_samba' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_snmp' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_sshd' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_syslogd' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_x' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'start_xdmcp' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'tex_enable' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'timezone' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				textual timezone (e.g. 'Europe/Berlin')
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'tvout' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'vmware' => {
-			applies_to_systems => 1,
-			applies_to_clients => 1,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				!!!descriptive text missing here!!!
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-	
-		'ramfs_fsmods' => {
-			applies_to_systems => 1,
-			applies_to_clients => 0,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				list of filesystem kernel modules to load
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'ramfs_miscmods' => {
-			applies_to_systems => 1,
-			applies_to_clients => 0,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				list of miscellaneous kernel modules to load
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'ramfs_nicmods' => {
-			applies_to_systems => 1,
-			applies_to_clients => 0,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				list of network card modules to load
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-		'ramfs_screen' => {
-			applies_to_systems => 1,
-			applies_to_clients => 0,
-			description => unshiftHereDoc(<<'			End-of-Here'),
-				resolution of splash screen to use in stage3
-			End-of-Here
-			content_regex => undef,
-			content_descr => undef,
-		},
-	};
-}
-
-1;
diff --git a/config-db/OpenSLX/AttributeRoster.pm b/config-db/OpenSLX/AttributeRoster.pm
index 481aeb3b..06dc95db 100644
--- a/config-db/OpenSLX/AttributeRoster.pm
+++ b/config-db/OpenSLX/AttributeRoster.pm
@@ -16,38 +16,363 @@ package OpenSLX::AttributeRoster;
 use strict;
 use warnings;
 
-our (@ISA, @EXPORT, $VERSION);
-
-use Exporter;
-$VERSION = 1.01;
-@ISA = qw(Exporter);
-
-@EXPORT = qw(
-	$%AttributeInfo
-);
-
 use OpenSLX::Basics;
+use OpenSLX::OSPlugin::Roster;
+use OpenSLX::Utils;
 
 ################################################################################
 ###
-### Load the available AttrInfo-modules and build a hash containing info about
-### all known attributes from the data contained in those modules.
+### Integrate info about all known attributes (from core and from the plugins)
+### into one big hash.
 ###
 ################################################################################
 
-my %AttributeInfo = ();
-
-my $libPath = "$openslxConfig{'base-path'}/lib";
-foreach my $module (glob("$libPath/OpenSLX/AttrInfo/*.pm")) {
-	next if $module !~ m{/([^/]+)\.pm$};
-	my $class = "OpenSLX::AttrInfo::$1";
-	vlog(2, "loading attr-info from module '$module'");
-	my $instance = instantiateClass($class);
-	my $attrInfo = $instance->AttrInfo();
-	foreach my $attr (keys %$attrInfo) {
-		$AttributeInfo{$attr} = $attrInfo->{$attr};
-	}
-}
+# set core attributes
+my %AttributeInfo = (
+	'automnt_dir' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'automnt_src' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'country' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'de',
+	},
+	'dm_allow_shutdown' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'user',
+	},
+	'hw_graphic' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'hw_monitor' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'hw_mouse' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'netbios_workgroup' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'slx-network',
+	},
+	'nis_domain' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'nis_servers' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'ramfs_fsmods' => {
+		applies_to_systems => 1,
+		applies_to_clients => 0,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			list of filesystem kernel modules to load
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'ramfs_miscmods' => {
+		applies_to_systems => 1,
+		applies_to_clients => 0,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			list of miscellaneous kernel modules to load
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'ramfs_nicmods' => {
+		applies_to_systems => 1,
+		applies_to_clients => 0,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			list of network card modules to load
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32',
+	},
+	'ramfs_screen' => {
+		applies_to_systems => 1,
+		applies_to_clients => 0,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			resolution of splash screen to use in stage3
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'sane_scanner' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'scratch' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'slxgrp' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => '',
+	},
+	'start_alsasound' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'yes',
+	},
+	'start_atd' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'no',
+	},
+	'start_cron' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'no',
+	},
+	'start_dreshal' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'yes',
+	},
+	'start_ntp' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'initial',
+	},
+	'start_nfsv4' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'no',
+	},
+	'start_printer' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'no',
+	},
+	'start_samba' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'may',
+	},
+	'start_snmp' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'no',
+	},
+	'start_sshd' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'yes',
+	},
+	'start_syslogd' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'yes',
+	},
+	'start_x' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'yes',
+	},
+	'start_xdmcp' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'kdm',
+	},
+	'tex_enable' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'no',
+	},
+	'timezone' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			textual timezone (e.g. 'Europe/Berlin')
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'Europe/Berlin',
+	},
+	'tvout' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'no',
+	},
+	'vmware' => {
+		applies_to_systems => 1,
+		applies_to_clients => 1,
+		description => unshiftHereDoc(<<'		End-of-Here'),
+			!!!descriptive text missing here!!!
+		End-of-Here
+		content_regex => undef,
+		content_descr => undef,
+		default => 'no',
+	},
+);
+
+# and add all plugin attributes, too
+OpenSLX::OSPlugin::Roster->addAllDefaultAttributesToHash(\%AttributeInfo);
 
 =item C<getAttrInfo()>
 
diff --git a/config-db/OpenSLX/ConfigDB.pm b/config-db/OpenSLX/ConfigDB.pm
index f563619e..025af2f6 100644
--- a/config-db/OpenSLX/ConfigDB.pm
+++ b/config-db/OpenSLX/ConfigDB.pm
@@ -185,7 +185,7 @@ sub connect		## no critic (ProhibitBuiltinHomonyms)
 	$self->{'db-type'} = $dbType;
 	$self->{'meta-db'} = $metaDB;
 
-	$self->{'db-schema'}->checkAndUpgradeDBSchemaIfNecessary($metaDB);
+	$self->{'db-schema'}->checkAndUpgradeDBSchemaIfNecessary($self);
 
 	return 1;
 }
diff --git a/config-db/OpenSLX/DBSchema.pm b/config-db/OpenSLX/DBSchema.pm
index 7e8c0162..5bfc4122 100644
--- a/config-db/OpenSLX/DBSchema.pm
+++ b/config-db/OpenSLX/DBSchema.pm
@@ -16,6 +16,7 @@ package OpenSLX::DBSchema;
 use strict;
 use warnings;
 
+use OpenSLX::AttributeRoster;
 use OpenSLX::Basics;
 
 ################################################################################
@@ -34,11 +35,7 @@ use OpenSLX::Basics;
 ### 		fk		=> foreign key (integer)
 ################################################################################
 
-use POSIX qw(locale_h);
-my $lang = setlocale(LC_MESSAGES);
-my $country = $lang =~ m[^\w\w_(\w\w)] ? lc($1) : 'us';
-
-my $VERSION = 0.21;
+my $VERSION = 0.22;
 
 my $DbSchema = {
 	'version' => $VERSION,
@@ -211,120 +208,6 @@ my $DbSchema = {
 				'name:s.128',		# attribute name
 				'value:s.255',		# attribute value
 			],
-			'vals' => [
-				# attributes of default system
-				{
-					'system_id' => 0,
-					'name' => 'country',
-					'value' => "$country",
-				},
-				{
-					'system_id' => 0,
-					'name' => 'dm_allow_shutdown',
-					'value' => 'user',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'late_dm',
-					'value' => 'no',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'netbios_workgroup',
-					'value' => 'slx-network',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'ramfs_nicmods',
-					'value' 
-						=> 'forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_alsasound',
-					'value' => 'yes',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_atd',
-					'value' => 'no',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_cron',
-					'value' => 'no',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_dreshal',
-					'value' => 'yes',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_ntp',
-					'value' => 'initial',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_nfsv4',
-					'value' => 'no',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_printer',
-					'value' => 'no',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_samba',
-					'value' => 'may',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_snmp',
-					'value' => 'no',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_sshd',
-					'value' => 'yes',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_syslog',
-					'value' => 'yes',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_x',
-					'value' => 'yes',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'start_xdmcp',
-					'value' => 'kdm',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'tex_enable',
-					'value' => 'no',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'timezone',
-					'value' => 'Europe/Berlin',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'tvout',
-					'value' => 'no',
-				},
-				{
-					'system_id' => 0,
-					'name' => 'vmware',
-					'value' => 'no',
-				},
-			],
 		},
 		'vendor_os' => {
 			# a vendor-OS describes a folder containing an operating system as
@@ -361,8 +244,10 @@ sub new
 
 sub checkAndUpgradeDBSchemaIfNecessary
 {
-	my $self   = shift;
-	my $metaDB = shift;
+	my $self     = shift;
+	my $configDB = shift;
+
+	my $metaDB = $configDB->{'meta-db'};
 
 	vlog(2, "trying to determine schema version...");
 	my $currVersion = $metaDB->schemaFetchDBVersion();
@@ -385,6 +270,7 @@ sub checkAndUpgradeDBSchemaIfNecessary
 			);
 		}
 		$metaDB->schemaSetDBVersion($DbSchema->{version});
+		$self->_synchronizeAttributesWithDefaultSystem($configDB);
 		vlog(1, _tr('DB has been created successfully'));
 	} elsif ($currVersion < $DbSchema->{version}) {
 		vlog(
@@ -395,6 +281,7 @@ sub checkAndUpgradeDBSchemaIfNecessary
 			)
 		);
 		$self->_schemaUpgradeDBFrom($metaDB, $currVersion);
+		$self->_synchronizeAttributesWithDefaultSystem($configDB);
 		vlog(1, _tr('upgrade done'));
 	} else {
 		vlog(1, _tr('DB matches current schema version (%s)', $currVersion));
@@ -413,6 +300,33 @@ sub getColumnsOfTable
 		@{$DbSchema->{tables}->{$tableName}->{cols}};
 }
 
+sub _synchronizeAttributesWithDefaultSystem
+{
+	my $self     = shift;
+	my $configDB = shift;
+
+	my $defaultSystem = $configDB->fetchSystemByID(0);
+	return if !$defaultSystem;
+
+	# fetch all known attributes from attribute roster and merge these 
+	# into the existing attributes of the default system
+	my $attrInfo = OpenSLX::AttributeRoster::getAttrInfo();
+	foreach my $attr (keys %$attrInfo) {
+		next if exists $defaultSystem->{attrs}->{$attr};
+		$defaultSystem->{attrs}->{$attr} = $attrInfo->{$attr}->{default};
+	}
+	
+	# remove unknown attributes from default system
+	my @unknownAttrs 
+		= grep { !exists $attrInfo->{$_} } keys %{$defaultSystem->{attrs}};
+	foreach my $unknownAttr (@unknownAttrs) {
+		delete $defaultSystem->{attrs}->{$unknownAttr};
+	}
+	
+	# now write back the updated default system
+	return $configDB->changeSystem(0, $defaultSystem);
+}
+
 ################################################################################
 ###
 ### methods for upgrading the DB schema
@@ -426,6 +340,7 @@ sub _schemaUpgradeDBFrom
 
 	$self->_upgradeDBTo0_2($metaDB) if $currVersion < 0.2;
 	$self->_upgradeDBTo0_21($metaDB) if $currVersion < 0.21;
+	$self->_upgradeDBTo0_22($metaDB) if $currVersion < 0.22;
 
 	return 1;
 }
@@ -671,4 +586,19 @@ sub _upgradeDBTo0_21
 	return 1;
 }
 
+sub _upgradeDBTo0_22
+{
+	my $self   = shift;
+	my $metaDB = shift;
+
+	vlog(0, "upgrading schema version to 0.22");
+
+	# dummy schema change, just to trigger the attribute synchronization
+	# into the default system
+
+	$metaDB->schemaSetDBVersion(0.22);
+
+	return 1;
+}
+
 1;
-- 
cgit v1.2.3-55-g7522