* fixed machine-setup not being generated for client-specific config-TGZs

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

1 files changed, 7 insertions, 6 deletions

diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer
index bf77bf4e..b042843e 100755
--- a/config-db/slxconfig-demuxer
+++ b/config-db/slxconfig-demuxer
@@ -436,6 +436,11 @@ sub writeClientConfigurationsForSystem
 		my $clientConfigPath
 			= "$clientConfigPath/$externalSystemID/$externalClientName";
 
+		# merge configurations of client, it's groups, default client and
+		# system and write the resulting attributes to a configuration file:
+		$openslxDB->mergeDefaultAndGroupAttributesIntoClient($client);
+		mergeAttributes($client, $info);
+
 		my $clientAttrDigest = digestAttributes($client);
 		vlog 2, _tr("attribute-digest for client '%s' is '%s'", $client->{name},
 				$clientAttrDigest);
@@ -448,17 +453,13 @@ sub writeClientConfigurationsForSystem
 						$client->{name});
 			$clientSystemConfCount++;
 
-			# merge configurations of client, it's groups, default client and
-			# system and write the resulting attributes to a configuration file:
-			$openslxDB->mergeDefaultAndGroupAttributesIntoClient($client);
-			mergeAttributes($client, $info);
-			writeAttributesToFile($client, $attrFile);
-
 			# merge default, system and client configuration files into
 			# the system configuration for the current client:
 			copyExternalSystemConfig($externalSystemID, $buildPath,
 									$externalClientName);
 
+			writeAttributesToFile($client, $attrFile);
+
 			# create tar containing external system configuration
 			# and client attribute file, this time referring to the client
 			# via its external ID (the PXE-style MAC), as the TGZ needs to