diff options
| author | Olivier Blin <oblin@mandriva.com> | 2010-04-02 12:37:53 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2010-04-02 12:37:53 +0000 |
| commit | fc8c3c6f4444c48fcb70cc20ef529e78577e2ca8 (patch) | |
| tree | 50760ae23b128b1c6023a1b7fe15ee559c390773 | |
| parent | f58682ccd8bfb6e4f966aad0190ded4a0eea98f6 (diff) | |
| download | drakiso-fc8c3c6f4444c48fcb70cc20ef529e78577e2ca8.tar drakiso-fc8c3c6f4444c48fcb70cc20ef529e78577e2ca8.tar.gz drakiso-fc8c3c6f4444c48fcb70cc20ef529e78577e2ca8.tar.bz2 drakiso-fc8c3c6f4444c48fcb70cc20ef529e78577e2ca8.tar.xz drakiso-fc8c3c6f4444c48fcb70cc20ef529e78577e2ca8.zip | |
use busybox again instead of busybox.static (thus keeping compat with older distro releases)
| -rw-r--r-- | lib/MDV/Draklive/Initrd.pm | 7 |
1 files changed, 3 insertions, 4 deletions
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}}); |