diff -u multipath-tools-0.4.8/debian/changelog multipath-tools-0.4.8/debian/changelog
--- multipath-tools-0.4.8/debian/changelog
+++ multipath-tools-0.4.8/debian/changelog
@@ -1,3 +1,12 @@
+multipath-tools (0.4.8-10ubuntu1.1) intrepid-proposed; urgency=low
+
+  * fix_udev_scsi_id_arguments.diff:
+    Update the arguments for scsi_id. (LP: #306723)
+  * fix_sysfs_layout.diff:
+    Patch from upstream to use the new sysfs layout. (LP: #307032)
+
+ -- Mathias Gug <mathiaz@ubuntu.com>  Thu, 22 Jan 2009 11:35:09 -0500
+
 multipath-tools (0.4.8-10ubuntu1) intrepid; urgency=low
 
   * Merge from debian unstable, remaining changes:
diff -u multipath-tools-0.4.8/debian/patches/series multipath-tools-0.4.8/debian/patches/series
--- multipath-tools-0.4.8/debian/patches/series
+++ multipath-tools-0.4.8/debian/patches/series
@@ -7,0 +8,2 @@
+fix_sysfs_layout.diff
+fix_udev_scsi_id_arguments.diff
only in patch2:
unchanged:
--- multipath-tools-0.4.8.orig/debian/patches/fix_udev_scsi_id_arguments.diff
+++ multipath-tools-0.4.8/debian/patches/fix_udev_scsi_id_arguments.diff
@@ -0,0 +1,95 @@
+Index: multipath-tools-0.4.8/libmultipath/defaults.h
+===================================================================
+--- multipath-tools-0.4.8.orig/libmultipath/defaults.h	2008-12-10 13:40:33.000000000 -0800
++++ multipath-tools-0.4.8/libmultipath/defaults.h	2008-12-10 13:40:41.000000000 -0800
+@@ -1,4 +1,4 @@
+-#define DEFAULT_GETUID		"/lib/udev/scsi_id -g -u -s /block/%n"
++#define DEFAULT_GETUID		"/lib/udev/scsi_id -g -u -d /dev/%n"
+ #define DEFAULT_UDEVDIR		"/dev"
+ #define DEFAULT_SELECTOR	"round-robin 0"
+ #define DEFAULT_FEATURES	"0"
+Index: multipath-tools-0.4.8/libmultipath/hwtable.c
+===================================================================
+--- multipath-tools-0.4.8.orig/libmultipath/hwtable.c	2008-12-10 13:39:49.000000000 -0800
++++ multipath-tools-0.4.8/libmultipath/hwtable.c	2008-12-10 13:40:05.000000000 -0800
+@@ -157,7 +157,7 @@
+ 		/* HP Smart Array */
+ 		.vendor        = "HP",
+ 		.product       = "LOGICAL VOLUME.*",
+-		.getuid        = "/lib/udev/scsi_id -n -g -u -s /block/%n",
++		.getuid        = "/lib/udev/scsi_id -n -g -u -d /dev/%n",
+ 		.getprio       = NULL,
+ 		.features      = DEFAULT_FEATURES,
+ 		.hwhandler     = DEFAULT_HWHANDLER,
+@@ -199,7 +199,7 @@
+ 	{
+ 		.vendor        = "EMC",
+ 		.product       = "SYMMETRIX",
+-		.getuid        = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
++		.getuid        = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -d /dev/%n",
+ 		.getprio       = NULL,
+ 		.features      = DEFAULT_FEATURES,
+ 		.hwhandler     = DEFAULT_HWHANDLER,
+Index: multipath-tools-0.4.8/multipath.conf.annotated
+===================================================================
+--- multipath-tools-0.4.8.orig/multipath.conf.annotated	2008-12-10 13:41:06.000000000 -0800
++++ multipath-tools-0.4.8/multipath.conf.annotated	2008-12-10 13:41:25.000000000 -0800
+@@ -47,9 +47,9 @@
+ #	# scope   : multipath
+ #	# desc    : the default program and args to callout to obtain a unique 
+ #	#           path identifier. Absolute path required
+-#	# default : /lib/udev/scsi_id -g -u -s
++#	# default : /lib/udev/scsi_id -g -u -d
+ #	#
+-#	getuid_callout	"/lib/udev/scsi_id -g -u -s /block/%n"
++#	getuid_callout	"/lib/udev/scsi_id -g -u -d /dev/%n"
+ #
+ #	#
+ #	# name    : prio_callout
+@@ -291,9 +291,9 @@
+ #		# scope   : multipath
+ #		# desc    : the program and args to callout to obtain a unique 
+ #		#           path identifier. Absolute path required
+-#		# default : /lib/udev/scsi_id -g -u -s
++#		# default : /lib/udev/scsi_id -g -u -d
+ #		#
+-#		getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
++#		getuid_callout          "/lib/udev/scsi_id -g -u -d /dev/%n"
+ #
+ #		#
+ #		# name    : prio_callout
+Index: multipath-tools-0.4.8/multipath.conf.synthetic
+===================================================================
+--- multipath-tools-0.4.8.orig/multipath.conf.synthetic	2008-12-10 13:41:29.000000000 -0800
++++ multipath-tools-0.4.8/multipath.conf.synthetic	2008-12-10 13:41:43.000000000 -0800
+@@ -7,7 +7,7 @@
+ #	polling_interval 	10
+ #	selector		"round-robin 0"
+ #	path_grouping_policy	multibus
+-#	getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
++#	getuid_callout		"/lib/udev/scsi_id -g -u -d /dev/%n"
+ #	prio_callout		/bin/true
+ #	path_checker		directio
+ #	rr_min_io		100
+@@ -52,7 +52,7 @@
+ #		vendor			"COMPAQ  "
+ #		product			"HSV110 (C)COMPAQ"
+ #		path_grouping_policy	multibus
+-#		getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
++#		getuid_callout          "/lib/udev/scsi_id -g -u -d /dev/%n"
+ #		path_checker		directio
+ #		path_selector		"round-robin 0"
+ #		hardware_handler	"0"
+Index: multipath-tools-0.4.8/multipath/multipath.conf.5
+===================================================================
+--- multipath-tools-0.4.8.orig/multipath/multipath.conf.5	2008-12-10 13:40:49.000000000 -0800
++++ multipath-tools-0.4.8/multipath/multipath.conf.5	2008-12-10 13:40:57.000000000 -0800
+@@ -109,7 +109,7 @@
+ The default program and args to callout to obtain a unique path
+ identifier. Should be specified with an absolute path. Default value
+ is
+-.I /lib/udev/scsi_id -g -u -s
++.I /lib/udev/scsi_id -g -u -d
+ .TP
+ .B prio_callout
+ The default program and args to callout to obtain a path priority
only in patch2:
unchanged:
--- multipath-tools-0.4.8.orig/debian/patches/fix_sysfs_layout.diff
+++ multipath-tools-0.4.8/debian/patches/fix_sysfs_layout.diff
@@ -0,0 +1,14 @@
+Index: multipath-tools-0.4.8/libmultipath/discovery.c
+===================================================================
+--- multipath-tools-0.4.8.orig/libmultipath/discovery.c	2008-12-10 17:47:31.000000000 -0800
++++ multipath-tools-0.4.8/libmultipath/discovery.c	2008-12-10 18:03:12.000000000 -0800
+@@ -546,6 +546,9 @@
+ 	if (!parent)
+ 		parent = pp->sysdev;
+ 
++  if (!strncmp(parent->kernel, "block",5))
++    parent = sysfs_device_get_parent(parent);
++
+ 	condlog(3, "%s: subsystem = %s", pp->dev, parent->subsystem);
+ 
+ 	if (!strncmp(parent->subsystem, "scsi",4))