summaryrefslogtreecommitdiffstats
path: root/initramfs
diff options
context:
space:
mode:
authorOliver Tappe2008-05-31 20:53:21 +0200
committerOliver Tappe2008-05-31 20:53:21 +0200
commit272b14501e974b2731bac808265b2b94f48e6071 (patch)
tree826135d7525f9c3fa7261c0dd38c9f60e8be1e21 /initramfs
parentComplete renaming in the main Makefile (for proper installation). (diff)
downloadcore-272b14501e974b2731bac808265b2b94f48e6071.tar.gz
core-272b14501e974b2731bac808265b2b94f48e6071.tar.xz
core-272b14501e974b2731bac808265b2b94f48e6071.zip
* moved code from MakeInitRamFS::Engine that determines the list of available
busybox applets into a separate function * use this function in OSSetup::Engine instead of relying on busybox.links, which may not be kept in sync. git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1827 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
-rw-r--r--initramfs/OpenSLX/MakeInitRamFS/Engine.pm12
1 files changed, 1 insertions, 11 deletions
diff --git a/initramfs/OpenSLX/MakeInitRamFS/Engine.pm b/initramfs/OpenSLX/MakeInitRamFS/Engine.pm
index 996d5f93..a5adb835 100644
--- a/initramfs/OpenSLX/MakeInitRamFS/Engine.pm
+++ b/initramfs/OpenSLX/MakeInitRamFS/Engine.pm
@@ -362,17 +362,7 @@ sub _copyBusybox
= "$openslxConfig{'base-path'}/share/busybox/busybox"
. ( hostIs64Bit() ? '.x86_64' : '.i586' );
- my $busyboxHelp = qx{$busyboxForHost --help};
- if ($busyboxHelp !~ m{defined functions:(.+)\z}ims) {
- die "unable to parse busybox --help output:\n$busyboxHelp";
- }
- my $rawAppletList = $1;
- my @busyboxApplets
- = map {
- $_ =~ s{\s+}{}igms;
- $_;
- }
- split m{,}, $rawAppletList;
+ my @busyboxApplets = getAvailableBusyboxApplets($busyboxForHost);
foreach my $applet (@busyboxApplets) {
$self->addCMD("ln -sf /bin/busybox $self->{'build-path'}/bin/$applet");
}