diff options
| author | Olivier Blin <oblin@mandriva.com> | 2010-08-04 14:55:26 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2010-08-04 14:55:26 +0000 |
| commit | fd43d643686a99ffa23063d3abc473a960d7af6d (patch) | |
| tree | d77457af91c009d4fb09a577293bd5b191aa72cb /lib/MDV/Draklive | |
| parent | 960dd2458a6b3563e28627a34b6c60df8a4c221a (diff) | |
| download | drakiso-fd43d643686a99ffa23063d3abc473a960d7af6d.tar drakiso-fd43d643686a99ffa23063d3abc473a960d7af6d.tar.gz drakiso-fd43d643686a99ffa23063d3abc473a960d7af6d.tar.bz2 drakiso-fd43d643686a99ffa23063d3abc473a960d7af6d.tar.xz drakiso-fd43d643686a99ffa23063d3abc473a960d7af6d.zip | |
use busybox.static if present in chroot
Diffstat (limited to 'lib/MDV/Draklive')
| -rw-r--r-- | lib/MDV/Draklive/Initrd.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm index 35f95e2..b88b9c7 100644 --- a/lib/MDV/Draklive/Initrd.pm +++ b/lib/MDV/Draklive/Initrd.pm @@ -100,6 +100,9 @@ sub create_media_specific_initrd { #- detect usb-storage process (we need sh/while/ps/grep) #- mount loopbacks read-only with losetup (useful over NFS) my $busybox = '/usr/bin/busybox'; + my $busybox_static = '/bin/busybox.static'; + $busybox = $busybox_static if -e $root . $busybox_static; + inst_initrd_bin($root, $initrd_tree, $busybox); my @l = map { /functions:/ .. /^$/ ? do { s/\s//g; split /,/ } : () } run_program::rooted_get_stdout($root, $busybox); shift @l; |