[Dmraid-debian-commits] [SCM] Maintenance of the dmraid package branch, master, updated. debian/1.0.0.rc15-8-3-g89d15f3

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 89d15f30155ef01f8e39b840f70b269e2074815e
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Tue Jun 23 18:21:28 2009 +0200

    debian/initramfs/dmraid.initramfs-hook/dmraid: copy grep only if if BUSYBOX=n, thanks to Colin Watson (Closes: #534299)

diff --git a/debian/initramfs/dmraid.initramfs-hook/dmraid b/debian/initramfs/dmraid.initramfs-hook/dmraid
index 2294496..fa77344 100644
--- a/debian/initramfs/dmraid.initramfs-hook/dmraid
+++ b/debian/initramfs/dmraid.initramfs-hook/dmraid
@@ -23,7 +23,9 @@ if [ -x /sbin/dmraid ]; then
 	force_load dm-raid45
 	copy_exec /sbin/dmraid sbin
 	copy_exec /sbin/dmraid-activate sbin
-	copy_exec /bin/grep bin
+	if [ "$BUSYBOX" = n ]; then
+		copy_exec /bin/grep bin
+	fi
 	if [ -f /etc/udev/rules.d/85_dmraid.rules ]; then
 		mkdir -p ${DESTDIR}/etc/udev/rules.d
 		cp -p /etc/udev/rules.d/85_dmraid.rules ${DESTDIR}/etc/udev/rules.d

-- 
Maintenance of the dmraid package