From: Robin H. Johnson <robbat2@orbis-terrarum.net>
Date: Thu, 12 Nov 2009 07:23:13 +0000 (-0800)
Subject: /etc/scsi_id.config does not exist by default in newer udev, but is still respected... 
X-Git-Tag: v3.4.10.907~5^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b05877d05278dced1cfa89577e35739ebe265cc9;p=genkernel.git

/etc/scsi_id.config does not exist by default in newer udev, but is still respected by utils if created, so do not error.
---

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index d8a363d..820dc04 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -168,7 +168,9 @@ append_multipath(){
 	then
 		cp /etc/multipath.conf "${TEMP}/initramfs-multipath-temp/etc/" || gen_die 'could not copy /etc/multipath.conf please check this'
 	fi
-	if [ -x /sbin/scsi_id ]
+	# /etc/scsi_id.config does not exist in newer udevs
+	# copy it optionally.
+	if [ -x /sbin/scsi_id -a -f /etc/scsi_id.config ]
 	then
 		cp /etc/scsi_id.config "${TEMP}/initramfs-multipath-temp/etc/" || gen_die 'could not copy scsi_id.config'
 	fi