Bug#337081: multipath-tools: bashism in /etc/udev/scripts/multipath.sh

[Steve Langasek]

Hi-ho,

I've prepared an NMU for this bug, and will be uploading shortly.  Please
find the final patch attached.

In addition to the bashism fix, it includes a fix to the upstream makefile
for compatibility with the new make's line continuation rules.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/

diff -u multipath-tools-0.4.5/debian/changelog 
multipath-tools-0.4.5/debian/changelog
--- multipath-tools-0.4.5/debian/changelog
+++ multipath-tools-0.4.5/debian/changelog
@@ -1,3 +1,14 @@
+multipath-tools (0.4.5-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * Fix /etc/udev/scripts/multipath.sh to be POSIX-compliant; thanks to
+    Clint Adams for the patch.  Closes: 337081.
+  * Fix upstream makefile for POSIX line continuation rules in the current
+    GNU make
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Wed, 11 Jan 2006 05:22:42 -0800
+
 multipath-tools (0.4.5-3) unstable; urgency=low
 
   * Fix kpartx compiling errors and dos support.
diff -u multipath-tools-0.4.5/multipath/multipath.sh 
multipath-tools-0.4.5/multipath/multipath.sh
--- multipath-tools-0.4.5/multipath/multipath.sh
+++ multipath-tools-0.4.5/multipath/multipath.sh
@@ -7,8 +7,10 @@
-if [ "${1:0:3}" = "dm-" ] ; then
-  dev=$(</sys${DEVPATH}/dev)
-  map=$(/sbin/devmap_name $dev)
-  /sbin/kpartx -v -a /dev/$map
-else
-  /sbin/multipath -v0 /dev/$1
-fi
-
+case "$1" in
+       dm-*)
+               dev=$(</sys${DEVPATH}/dev)
+               map=$(/sbin/devmap_name $dev)
+               /sbin/kpartx -v -a /dev/$map
+               ;;
+       *)
+               /sbin/multipath -v0 /dev/$1
+               ;;
+esac
only in patch2:
unchanged:
--- multipath-tools-0.4.5.orig/Makefile
+++ multipath-tools-0.4.5/Makefile
@@ -33,17 +33,17 @@
        done
 
 recurse_clean:
-       @for dir in $(BUILDDIRS); do\
+       @for dir in $(BUILDDIRS); do \
        $(MAKE) -C $$dir clean || exit $?; \
        done
 
 recurse_install:
-       @for dir in $(BUILDDIRS); do\
+       @for dir in $(BUILDDIRS); do \
        $(MAKE) -C $$dir install || exit $?; \
        done
 
 recurse_uninstall:
-       @for dir in $(BUILDDIRS); do\
+       @for dir in $(BUILDDIRS); do \
        $(MAKE) -C $$dir uninstall || exit $?; \
        done
 

signature.asc
Description: Digital signature