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