From 95696c9fbb0db1d09505eebcbd32f5cd81093a6c Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Wed, 9 Jan 2008 12:56:38 +0000
Subject: * fixed several occurrences of 'attr_'-names

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1453 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 config-db/slxconfig-demuxer | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'config-db')

diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer
index 9cdc4c51..485a7545 100755
--- a/config-db/slxconfig-demuxer
+++ b/config-db/slxconfig-demuxer
@@ -422,16 +422,17 @@ sub generateInitalRamFS
 
 	vlog(1, _tr('generating initialramfs %s/initramfs', $pxeVendorOSPath));
 	my $cmd = "$openslxConfig{'base-path'}/bin/mkdxsinitrd ";
-	if ($info->{attr_ramfs_nicmods}) {
-		$cmd .= qq[-n "$info->{attr_ramfs_nicmods}" ];
+	my $attrs = $info->{attrs} || {};
+	if ($attrs->{ramfs_nicmods}) {
+		$cmd .= qq[-n "$attrs->{ramfs_nicmods}" ];
 	}
-	my $fsMods = $info->{attr_ramfs_fsmods} || '';
+	my $fsMods = $attrs->{ramfs_fsmods} || '';
 	$fsMods .= ' ' . $osExportEngine->requiredFSMods();
 	if ($fsMods) {
 		$cmd .= qq[-f "$fsMods" ];
 	}
-	if ($info->{attr_ramfs_miscmods}) {
-		$cmd .= qq[-m "$info->{attr_ramfs_miscmods}" ];
+	if ($attrs->{ramfs_miscmods}) {
+		$cmd .= qq[-m "$attrs->{ramfs_miscmods}" ];
 	}
 	my $rootPath = "$openslxConfig{'private-path'}/stage1/$vendorOS->{name}";
 	$cmd .= "-i $pxeVendorOSPath/$info->{'initramfs-name'} -r $rootPath ";
@@ -451,9 +452,9 @@ sub generateInitalRamFS
 	my $initramfsAttrs    = {
 		attrs => {
 			'host_name'		=> 'slx-client', # just to have something at all
-			'ramfs_fsmods'  => $info->{'attr_ramfs_fsmods'} || '',
-			'ramfs_nicmods' => $info->{'attr_ramfs_nicmods'} || '',
-			'ramfs_screen'  => $info->{'attr_ramfs_screen'} || '',
+			'ramfs_fsmods'  => $attrs->{'ramfs_fsmods'} || '',
+			'ramfs_nicmods' => $attrs->{'ramfs_nicmods'} || '',
+			'ramfs_screen'  => $attrs->{'ramfs_screen'} || '',
 			'rootfs'        => $info->{'export-uri'} || '',
 		},
 	};
-- 
cgit v1.2.3-55-g7522