Annotation of /trunk/dracut/patches/dracut-037-alx-busybox-install-method.patch
Parent Directory | Revision Log
Revision 2425 -
(hide annotations)
(download)
Fri Mar 28 10:31:31 2014 UTC (10 years, 1 month ago) by niro
File size: 1052 byte(s)
Fri Mar 28 10:31:31 2014 UTC (10 years, 1 month ago) by niro
File size: 1052 byte(s)
-re-worked for dracut-037
1 | niro | 2425 | --- dracut-037/modules.d/05busybox/module-setup.sh 2014-03-19 16:16:08.000000000 +0000 |
2 | +++ dracut-037-busybox/modules.d/05busybox/module-setup.sh 2014-03-28 12:38:27.555000000 +0000 | ||
3 | @@ -5,6 +5,7 @@ | ||
4 | # called by dracut | ||
5 | check() { | ||
6 | require_binaries busybox || return 1 | ||
7 | + [ -e /usr/share/busybox/busybox.links ] || return 1 | ||
8 | |||
9 | return 255 | ||
10 | } | ||
11 | @@ -16,21 +17,12 @@ | ||
12 | |||
13 | # called by dracut | ||
14 | install() { | ||
15 | - local _i _progs _path _busybox | ||
16 | + local _prog _busybox | ||
17 | _busybox=$(type -P busybox) | ||
18 | inst $_busybox /usr/bin/busybox | ||
19 | - for _i in $($_busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}') | ||
20 | + for _prog in $(< /usr/share/busybox/busybox.links) | ||
21 | do | ||
22 | - _progs="$_progs $_i" | ||
23 | - done | ||
24 | - | ||
25 | - # FIXME: switch_root should be in the above list, but busybox version hangs | ||
26 | - # (using busybox-1.15.1-7.fc14.i686 at the time of writing) | ||
27 | - | ||
28 | - for _i in $_progs; do | ||
29 | - _path=$(find_binary "$_i") | ||
30 | - [ -z "$_path" ] && continue | ||
31 | - ln_r /usr/bin/busybox $_path | ||
32 | + inst_symlink $_prog | ||
33 | done | ||
34 | } | ||
35 |