summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@orbis-terrarum.net>2009-11-11 23:23:13 -0800
committerRobin H. Johnson <robbat2@orbis-terrarum.net>2009-11-11 23:23:13 -0800
commitb05877d05278dced1cfa89577e35739ebe265cc9 (patch)
tree89c13ceafa286853a5bb65d8cd6d529ffc05f74a
parentLet iSCSId settle after iscsistart (diff)
downloadgenkernel-b05877d05278dced1cfa89577e35739ebe265cc9.tar.gz
genkernel-b05877d05278dced1cfa89577e35739ebe265cc9.tar.bz2
genkernel-b05877d05278dced1cfa89577e35739ebe265cc9.zip
/etc/scsi_id.config does not exist by default in newer udev, but is still respected by utils if created, so do not error.
-rwxr-xr-xgen_initramfs.sh4
1 files changed, 3 insertions, 1 deletions
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