portage-overlay/sys-fs/multipath-tools/files/0008-udev-as-of-0.124-doesn-t-support-scsi_id-s-anymor.patch

   1 From: Guido Guenther <agx@sigxcpu.org>
   2 Date: Fri, 15 Aug 2008 15:38:00 +0200
   3 Subject: [PATCH] udev as of 0.124 doesn't support 'scsi_id -s' anymore
   4
   5 ---
   6  libmultipath/defaults.h    |    2 +-
   7  libmultipath/hwtable.c     |    4 ++--
   8  multipath.conf.annotated   |    4 ++--
   9  multipath.conf.synthetic   |    4 ++--
  10  multipath/multipath.conf.5 |    2 +-
  11  5 files changed, 8 insertions(+), 8 deletions(-)
  12
  13 diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
  14 index df7d971..3047ae5 100644
  15 --- a/libmultipath/defaults.h
  16 +++ b/libmultipath/defaults.h
  17 @@ -1,4 +1,4 @@
  18 -#define DEFAULT_GETUID         "/lib/udev/scsi_id -g -u -s /block/%n"
  19 +#define DEFAULT_GETUID         "/lib/udev/scsi_id -g -u -d /dev/%n"
  20  #define DEFAULT_UDEVDIR                "/dev"
  21  #define DEFAULT_SELECTOR       "round-robin 0"
  22  #define DEFAULT_FEATURES       "0"
  23 diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
  24 index ef761d7..e8fb5f9 100644
  25 --- a/libmultipath/hwtable.c
  26 +++ b/libmultipath/hwtable.c
  27 @@ -157,7 +157,7 @@ static struct hwentry default_hw[] = {
  28                 /* HP Smart Array */
  29                 .vendor        = "HP",
  30                 .product       = "LOGICAL VOLUME.*",
  31 -               .getuid        = "/lib/udev/scsi_id -n -g -u -s /block/%n",
  32 +               .getuid        = "/lib/udev/scsi_id -n -g -u -d /dev/%n",
  33                 .getprio       = NULL,
  34                 .features      = DEFAULT_FEATURES,
  35                 .hwhandler     = DEFAULT_HWHANDLER,
  36 @@ -199,7 +199,7 @@ static struct hwentry default_hw[] = {
  37         {
  38                 .vendor        = "EMC",
  39                 .product       = "SYMMETRIX",
  40 -               .getuid        = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
  41 +               .getuid        = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -d /dev/%n",
  42                 .getprio       = NULL,
  43                 .features      = DEFAULT_FEATURES,
  44                 .hwhandler     = DEFAULT_HWHANDLER,
  45 diff --git a/multipath.conf.annotated b/multipath.conf.annotated
  46 index e6cfe9a..76c2204 100644
  47 --- a/multipath.conf.annotated
  48 +++ b/multipath.conf.annotated
  49 @@ -49,7 +49,7 @@
  50  #      #           path identifier. Absolute path required
  51  #      # default : /lib/udev/scsi_id -g -u -s
  52  #      #
  53 -#      getuid_callout  "/lib/udev/scsi_id -g -u -s /block/%n"
  54 +#      getuid_callout  "/lib/udev/scsi_id -g -u -d /dev/%n"
  55  #
  56  #      #
  57  #      # name    : prio_callout
  58 @@ -293,7 +293,7 @@
  59  #              #           path identifier. Absolute path required
  60  #              # default : /lib/udev/scsi_id -g -u -s
  61  #              #
  62 -#              getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
  63 +#              getuid_callout          "/lib/udev/scsi_id -g -u -d /dev/%n"
  64  #
  65  #              #
  66  #              # name    : prio_callout
  67 diff --git a/multipath.conf.synthetic b/multipath.conf.synthetic
  68 index 633d625..41ebdec 100644
  69 --- a/multipath.conf.synthetic
  70 +++ b/multipath.conf.synthetic
  71 @@ -7,7 +7,7 @@
  72  #      polling_interval        10
  73  #      selector                "round-robin 0"
  74  #      path_grouping_policy    multibus
  75 -#      getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
  76 +#      getuid_callout          "/lib/udev/scsi_id -g -u -d /dev/%n"
  77  #      prio_callout            /bin/true
  78  #      path_checker            directio
  79  #      rr_min_io               100
  80 @@ -52,7 +52,7 @@
  81  #              vendor                  "COMPAQ  "
  82  #              product                 "HSV110 (C)COMPAQ"
  83  #              path_grouping_policy    multibus
  84 -#              getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
  85 +#              getuid_callout          "/lib/udev/scsi_id -g -u -d /dev/%n"
  86  #              path_checker            directio
  87  #              path_selector           "round-robin 0"
  88  #              hardware_handler        "0"
  89 diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
  90 index c8ab6b0..233a154 100644
  91 --- a/multipath/multipath.conf.5
  92 +++ b/multipath/multipath.conf.5
  93 @@ -109,7 +109,7 @@ Default value is \fImultibus\fR.
  94  The default program and args to callout to obtain a unique path
  95  identifier. Should be specified with an absolute path. Default value
  96  is
  97 -.I /lib/udev/scsi_id -g -u -s
  98 +.I /lib/udev/scsi_id -g -u -d /dev/%n
  99  .TP
 100  .B prio_callout
 101  The default program and args to callout to obtain a path priority
 102 --