From 67ba88c289094435b98075c1fd1876430cfa2792 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Fri, 28 Oct 2016 15:21:17 -0500 Subject: [PATCH] Added check for binaries in mkinitramfs --- Makefile | 2 +- SRC/mkinitramfs-0.0/sbin/mkinitramfs | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8f251d3..34c6ba2 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ DEPENDS = findutils,kmod,psmisc,sed ARCH = x86_64 URL = DESC = This package includes scripts to build an initrd image -SNAPVER = sr2 +SNAPVER = sr3 ARCHIVE := '' SRCDIR := $(PWD)/SRC/mkinitramfs-* diff --git a/SRC/mkinitramfs-0.0/sbin/mkinitramfs b/SRC/mkinitramfs-0.0/sbin/mkinitramfs index 88502a2..0270417 100755 --- a/SRC/mkinitramfs-0.0/sbin/mkinitramfs +++ b/SRC/mkinitramfs-0.0/sbin/mkinitramfs @@ -101,16 +101,20 @@ fi # Install basic binaries for f in $binfiles ; do - ldd /bin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted - copy $f bin + if [ -x /bin/$f ]; then + ldd /bin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted + copy $f bin + fi done # Add lvm if present if [ -x /sbin/lvm ] ; then sbinfiles="$sbinfiles lvm dmsetup"; fi for f in $sbinfiles ; do - ldd /sbin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted - copy $f sbin + if [ -x /sbin/$f ]; then + ldd /sbin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted + copy $f sbin + fi done # Add module symlinks if appropriate