summaryrefslogtreecommitdiffstats
path: root/config-db
diff options
context:
space:
mode:
authorOliver Tappe2007-05-06 20:22:48 +0200
committerOliver Tappe2007-05-06 20:22:48 +0200
commit8cb009f50a801bddc993ca3177e4fd768f912294 (patch)
tree4e7ea6a14c8490213913d5c22dd0f7d6d41895c5 /config-db
parent* fixed bug that inhibited busybox to drag the required libs along (diff)
downloadcore-8cb009f50a801bddc993ca3177e4fd768f912294.tar.gz
core-8cb009f50a801bddc993ca3177e4fd768f912294.tar.xz
core-8cb009f50a801bddc993ca3177e4fd768f912294.zip
* added support to exporter modules for passing out the required fs-modules
* improved config-demuxer to ask exporter for required fs-mods and pass this to mkdxsinitrd git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1019 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db')
-rwxr-xr-xconfig-db/slxconfig-demuxer13
1 files changed, 9 insertions, 4 deletions
diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer
index 45c83365..cd1307bd 100755
--- a/config-db/slxconfig-demuxer
+++ b/config-db/slxconfig-demuxer
@@ -354,13 +354,18 @@ sub generateInitalRamFS
my $vendorOS = $info->{'vendor-os'};
+ my $osExportEngine = instantiateClass("OpenSLX::OSExport::Engine");
+ $osExportEngine->initializeFromExisting($info->{export}->{name});
+
vlog 1, _tr('generating initialramfs %s/initramfs', $pxeVendorOSPath);
my $cmd = "$openslxConfig{'bin-path'}/mkdxsinitrd ";
- if (length($info->{ramfs_nicmods}) > 0) {
- $cmd .= qq[-n "$info->{ramfs_nicmods}" ];
+ if (length($info->{attr_ramfs_nicmods}) > 0) {
+ $cmd .= qq[-n "$info->{attr_ramfs_nicmods}" ];
}
- if (length($info->{ramfs_fsmods}) > 0) {
- $cmd .= qq[-f "$info->{ramfs_fsmods}" ];
+ my $fsMods = $info->{attr_ramfs_fsmods};
+ $fsMods .= ' '.$osExportEngine->requiredFSMods();
+ if (length($fsMods) > 0) {
+ $cmd .= qq[-f "$fsMods" ];
}
my $rootPath
= "$openslxConfig{'stage1-path'}/$vendorOS->{name}";