From: Andrew Gaffney <agaffney@gentoo.org>
Date: Fri, 6 Mar 2009 13:35:18 +0000 (-0600)
Subject: Apply patch from robbat2 to fix whitespace breakage in multipath code
X-Git-Tag: v3.4.10.904~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81b4ff25168f7a316097cbad0808a2f245118d08;p=genkernel.git

Apply patch from robbat2 to fix whitespace breakage in multipath code
---

diff --git a/ChangeLog b/ChangeLog
index 9e5f753..5826514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  06 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
+  Apply patch from robbat2 to fix whitespace breakage in multipath code
+
   06 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh,
   genkernel.conf:
   Apply patch from robbat2 to finish wiring up multipath support
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 95fa971..9b9df15 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -135,31 +135,31 @@ append_multipath(){
 	mkdir -p "${TEMP}/initramfs-multipath-temp/etc/" 
 	mkdir -p "${TEMP}/initramfs-multipath-temp/sbin/"
 	mkdir -p "${TEMP}/initramfs-multipath-temp/lib/"
-	cp -a /lib/ld-* "${TEMP}/initramfs-multipath-temp/lib" \ 
+	cp -a /lib/ld-* "${TEMP}/initramfs-multipath-temp/lib" \
 		|| gen_die 'Could not copy files for MULTIPATH!' 
-	cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-multipath-temp/lib" \ 
+	cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-multipath-temp/lib" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-multipath-temp/lib" \ 
+	cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-multipath-temp/lib" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /lib/libsysfs*so* "${TEMP}/initramfs-multipath-temp/lib" \ 
+	cp -a /lib/libsysfs*so* "${TEMP}/initramfs-multipath-temp/lib" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /lib/libdevmapper*so* "${TEMP}/initramfs-multipath-temp/lib" \ 
+	cp -a /lib/libdevmapper*so* "${TEMP}/initramfs-multipath-temp/lib" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /sbin/multipath "${TEMP}/initramfs-multipath-temp/sbin" \ 
+	cp -a /sbin/multipath "${TEMP}/initramfs-multipath-temp/sbin" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /sbin/kpartx "${TEMP}/initramfs-multipath-temp/sbin" \ 
+	cp -a /sbin/kpartx "${TEMP}/initramfs-multipath-temp/sbin" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /sbin/mpath_prio_* "${TEMP}/initramfs-multipath-temp/sbin" \ 
+	cp -a /sbin/mpath_prio_* "${TEMP}/initramfs-multipath-temp/sbin" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /lib64/udev/scsi_id "${TEMP}/initramfs-multipath-temp/sbin" \ 
+	cp -a /lib64/udev/scsi_id "${TEMP}/initramfs-multipath-temp/sbin" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /sbin/devmap_name "${TEMP}/initramfs-multipath-temp/sbin" \ 
+	cp -a /sbin/devmap_name "${TEMP}/initramfs-multipath-temp/sbin" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /sbin/dmsetup "${TEMP}/initramfs-multipath-temp/sbin" \ 
+	cp -a /sbin/dmsetup "${TEMP}/initramfs-multipath-temp/sbin" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /sbin/dmsetup "${TEMP}/initramfs-multipath-temp/sbin" \ 
+	cp -a /sbin/dmsetup "${TEMP}/initramfs-multipath-temp/sbin" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
-	cp -a /bin/mountpoint "${TEMP}/initramfs-multipath-temp/bin" \ 
+	cp -a /bin/mountpoint "${TEMP}/initramfs-multipath-temp/bin" \
 		|| gen_die 'Could not copy files for MULTIPATH!'
 	if [ -x /sbin/multipath ] 
 	then
@@ -169,7 +169,7 @@ append_multipath(){
 	then
 		cp /etc/scsi_id.config "${TEMP}/initramfs-multipath-temp/etc/" || gen_die 'could not copy scsi_id.config'
 	fi
-	cd "${TEMP/initramfs-multipath-temp/"
+	cd "${TEMP/initramfs-multipath-temp/}"
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
 	rm -r "${TEMP}/initramfs-multipath-temp/"
 }
@@ -585,7 +585,7 @@ create_initramfs() {
 	append_data 'evms' "${EVMS}"
 	append_data 'mdadm' "${MDADM}"
 	append_data 'luks' "${LUKS}"
-	append_data 'multipath" "${MULTIPATH}"
+	append_data 'multipath' "${MULTIPATH}"
 
 	if [ "${NORAMDISKMODULES}" -eq '0' ]
 	then