From 07868c2f0f543db0dc7dd107dfb6d57f9c43c1d9 Mon Sep 17 00:00:00 2001 From: tclover Date: Wed, 14 Jan 2015 00:14:48 +0100 Subject: [PATCH] mkinitramfs-ll.{ba,z}sh: update following minimal.applets --- mkinitramfs-ll.bash | 9 ++++----- mkinitramfs-ll.zsh | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mkinitramfs-ll.bash b/mkinitramfs-ll.bash index 09da6df..27f8ca7 100755 --- a/mkinitramfs-ll.bash +++ b/mkinitramfs-ll.bash @@ -374,11 +374,10 @@ fi if [[ ! -f ${opts[-confdir]}/busybox.applets ]]; then bin/busybox --list-full >${opts[-confdir]}/busybox.applets || die fi - -while read line; do - grep -q ${line} ${opts[-confdir]}/busybox.applets || - die "${line} applet not found, no suitable busybox found" -done <${opts[-confdir]}/minimal.applets +for bin in $(< ${opts[-usrdir]}/../scripts/minimal.applets); do + grep -q ${bin} ${opts[-confdir]}/busybox.applets || + die "${bin} applet not found, no suitable busybox found" +done for bin in $(grep '^bin' ${opts[-confdir]}/busybox.applets); do ln -s busybox ${bin} diff --git a/mkinitramfs-ll.zsh b/mkinitramfs-ll.zsh index dd22055..2867790 100755 --- a/mkinitramfs-ll.zsh +++ b/mkinitramfs-ll.zsh @@ -349,6 +349,10 @@ if [[ -x usr/bin/busybox ]] { if [[ ! -f ${opts[-confdir]}/busybox.applets ]] { bin/busybox --list-full >${opts[-confdir]}/busybox.applets || die } +for bin ($(< ${opts[-usrdir]}/../scripts/minimal.applets)) { + grep -q ${bin} ${opts[-confdir]}/busybox.applets || + die "${bin} applet not found, no suitable busybox found" +} for bin ($(grep '^bin' ${opts[-confdir]}/busybox.applets)) ln -s busybox ${bin}