diff options
| author | Oliver Tappe | 2007-04-28 19:34:34 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-04-28 19:34:34 +0200 |
| commit | 5b2a2d233445ad29e3ff1ce9ca8e8af3753c3697 (patch) | |
| tree | 29002b910c1f66ef9f0d753f39bc2f55be46a7c6 /config-db | |
| parent | * fixed -D not being accepted (diff) | |
| download | core-5b2a2d233445ad29e3ff1ce9ca8e8af3753c3697.tar.gz core-5b2a2d233445ad29e3ff1ce9ca8e8af3753c3697.tar.xz core-5b2a2d233445ad29e3ff1ce9ca8e8af3753c3697.zip | |
* instead of the outdated slxmkramfs, the demuxer now uses the older, but better
mkdxsinitrd
* removed slxmkramfs, as it is going to be reimplemented in perl, later
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@944 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db')
| -rwxr-xr-x | config-db/slxconfig-demuxer | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer index 7f9bb1eb..a26a5f10 100755 --- a/config-db/slxconfig-demuxer +++ b/config-db/slxconfig-demuxer @@ -325,10 +325,7 @@ sub generateInitalRamFS my $vendorOS = $info->{'vendor-os'}; vlog 1, _tr('generating initialramfs %s/initramfs', $pxeVendorOSPath); - my $cmd = "$openslxConfig{'bin-path'}/slxmkramfs "; - if ($info->{ramfs_use_busybox}) { - $cmd .= '-b '; - } + my $cmd = "$openslxConfig{'bin-path'}/mkdxsinitrd "; my $debugLevel = $info->{ramfs_debug_level}; if ($debugLevel) { $cmd .= qq[-d $debugLevel ]; @@ -342,33 +339,23 @@ sub generateInitalRamFS my $rootPath = "$openslxConfig{'stage1-path'}/$vendorOS->{name}"; $cmd .= "-i $pxeVendorOSPath/$info->{'initramfs-name'} -r $rootPath "; + $cmd .= "-s openslx "; - # fill slxConf-hash... - my %slxConf; - # ...set date initrd has been generated... - $slxConf{'slxconf_date'} = $callDate; # ...set kernel version... my $kernelFile = readlink($info->{'kernel-file'}); $kernelFile =~ m[-(.+)$]; - $slxConf{'slxconf_kernver'} = $1; - # ...set distro version... - $slxConf{'slxconf_distro'} = $vendorOS->{'name'}; - # ...set list of network modules... - $slxConf{'slxconf_listnwmod'} - = $info->{'ramfs_nicmods'} || $settings->{'default_nicmods'}; + $cmd .= "-k $1 "; + # ...set distro and distro version... + $vendorOS->{'name'} =~ m[^([^-]+)-([^-]+)]; + $cmd .= "-D $1 -v $2 "; # ...add version info... my $slxver = `slxversion`; chomp $slxver; - $slxConf{'slxconf_slxver'} = $slxver; - # ...now create slxsystem.conf file and pass it to slxmkramfs: - writeSlxConfigToFile(\%slxConf, "$tempPath/slxsystem.conf"); - $cmd .= qq[-s "$tempPath/slxsystem.conf" ]; - + $ENV{'SLX_VERSION'} = $slxver; $ENV{'SLX_PRIVATE_PATH'} = $openslxConfig{'private-path'}; $ENV{'SLX_PUBLIC_PATH'} = $openslxConfig{'public-path'}; $ENV{'SLX_SHARE_PATH'} = $openslxConfig{'share-path'}; - vlog 2, _tr('executing %s', $cmd); - system($cmd) unless $dryRun; + slxsystem($cmd) unless $dryRun; } sub writeSystemPXEFiles |