From: Harald Hoyer <harald@redhat.com>
Date: Fri, 7 May 2010 08:44:30 +0000 (+0200)
Subject: use "grep" directly without "nm" to drop binutils requirement
X-Git-Tag: 006~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5be225d2998f5c1ad7d52f2832e66d5d0f867fe6;p=thirdparty%2Fdracut.git

use "grep" directly without "nm" to drop binutils requirement
---

diff --git a/dracut b/dracut
index cd524991c..6d9bf7c07 100755
--- a/dracut
+++ b/dracut
@@ -46,8 +46,8 @@ Creates initial ramdisk images for preloading modules
                         firmwares, separated by :
   --kernel-only         Only install kernel drivers and firmware files
   --no-kernel           Do not install kernel drivers and firmware files
-  --strip               Strip binaries in the initramfs (default)
-  --nostrip             Do not strip binaries in the initramfs
+  --strip               Strip binaries in the initramfs
+  --nostrip             Do not strip binaries in the initramfs (default)
   --mdadmconf           Include local /etc/mdadm.conf
   --nomdadmconf         Do not include local /etc/mdadm.conf
   --lvmconf             Include local /etc/lvm/lvm.conf
@@ -155,7 +155,7 @@ fi
 [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
 [[ $dracutbasedir ]] || dracutbasedir=/usr/share/dracut
 [[ $fw_dir ]] || fw_dir=/lib/firmware
-[[ $do_strip ]] || do_strip=yes
+[[ $do_strip ]] || do_strip=no
 # eliminate IFS hackery when messing with fw_dir
 fw_dir=${fw_dir//:/ }
 
diff --git a/dracut.spec b/dracut.spec
index 7a2816d86..64a287f17 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -47,7 +47,6 @@ Requires: module-init-tools >= 3.7-9
 Requires: cpio
 Requires: coreutils
 Requires: findutils
-Requires: binutils
 Requires: grep
 Requires: which
 Requires: mktemp >= 1.5-5
diff --git a/modules.d/40network/installkernel b/modules.d/40network/installkernel
index 514902d67..4c7adcd4b 100755
--- a/modules.d/40network/installkernel
+++ b/modules.d/40network/installkernel
@@ -4,8 +4,8 @@
 net_module_test() {
     local net_drivers='eth_type_trans|register_virtio_device'
     local unwanted_drivers='/(wireless|isdn|uwb)/'
-    nm -uPA "$1" | egrep -q $net_drivers && \
-	nm -uPA "$1" | egrep -qv 'iw_handler_get_spy' && \
+    egrep -q $net_drivers "$1" && \
+	egrep -qv 'iw_handler_get_spy' "$1" && \
 	[[ ! $1 =~ $unwanted_drivers ]]
 }
 
diff --git a/modules.d/50plymouth/installkernel b/modules.d/50plymouth/installkernel
index 61f2422bf..9f3291dae 100755
--- a/modules.d/50plymouth/installkernel
+++ b/modules.d/50plymouth/installkernel
@@ -1,5 +1,5 @@
 #!/bin/bash
 # Include KMS capable drm drivers
 for modname in $(find "$srcmods/kernel/drivers/gpu/drm" -name '*.ko' 2>/dev/null); do
-    nm -uPA $modname | grep -q drm_crtc_init && instmods $modname
+    grep -q drm_crtc_init  $modname && instmods $modname
 done
diff --git a/modules.d/90kernel-modules/installkernel b/modules.d/90kernel-modules/installkernel
index 10d3cfca7..2171e5a8a 100755
--- a/modules.d/90kernel-modules/installkernel
+++ b/modules.d/90kernel-modules/installkernel
@@ -3,7 +3,7 @@ if [[ -z $drivers ]]; then
     block_module_test() {
 	local blockfuncs='ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device'
 
-	 nm -uPA "$1" | egrep -q "$blockfuncs"
+	egrep -q "$blockfuncs" "$1"
     }
     hostonly='' instmods sr_mod sd_mod scsi_dh scsi_dh_rdac scsi_dh_emc
     hostonly='' instmods pcmcia firewire-ohci
diff --git a/modules.d/90multipath/installkernel b/modules.d/90multipath/installkernel
index 4a596f004..c2f4ec0db 100755
--- a/modules.d/90multipath/installkernel
+++ b/modules.d/90multipath/installkernel
@@ -2,7 +2,7 @@
 
 mp_mod_test() {
     local mpfuncs='scsi_register_device_handler|dm_dirty_log_type_register|dm_register_path_selector|dm_register_target'
-    nm -uPA "$1" | egrep -q "$mpfuncs"
+    egrep -q "$mpfuncs" "$1"
 }
 
 instmods $(filter_kernel_modules mp_mod_test)