From fc8c3c6f4444c48fcb70cc20ef529e78577e2ca8 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 2 Apr 2010 12:37:53 +0000 Subject: use busybox again instead of busybox.static (thus keeping compat with older distro releases) --- lib/MDV/Draklive/Initrd.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm index 8411787..93642dc 100644 --- a/lib/MDV/Draklive/Initrd.pm +++ b/lib/MDV/Draklive/Initrd.pm @@ -99,12 +99,11 @@ sub create_media_specific_initrd { #- busybox is required to: #- detect usb-storage process (we need sh/while/ps/grep) #- mount loopbacks read-only with losetup (useful over NFS) - my $busybox = '/bin/busybox.static'; + my $busybox = '/usr/bin/busybox'; inst_initrd_bin($root, $initrd_tree, $busybox); - my $busybox_rooted = $root . $busybox; - my @l = map { /functions:/ .. /^$/ ? do { s/\s//g; split /,/ } : () } `$busybox_rooted`; + my @l = map { /functions:/ .. /^$/ ? do { s/\s//g; split /,/ } : () } run_program::rooted_get_stdout($root, $busybox); shift @l; - symlink('busybox.static', $initrd_tree . "/bin/$_") foreach @l; + symlink(basename($busybox), $initrd_tree . "/bin/$_") foreach @l; my $fs = $media->get_media_setting('fs'); my @used_loop_types = uniq(map { $_->{type} } @{$live->{mount}{dirs}}); -- cgit v1.2.1