[libmultipath] don't rely on PATH being set anymore for callouts

Redhat resync.

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 48f055e..df6f5aa 100644 (file)
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -181,7 +181,7 @@ static struct hwentry default_hw[] = {
        {
                .vendor        = "EMC",
                .product       = "SYMMETRIX",
-               .getuid        = "scsi_id -g -u -ppre-spc3-83 -s /block/%n",
+               .getuid        = "/sbin/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
                .getprio       = NULL,
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
@@ -198,7 +198,7 @@ static struct hwentry default_hw[] = {
                .product       = ".*",
                .bl_product    = "LUNZ",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_emc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_emc /dev/%n",
                .features      = "1 queue_if_no_path",
                .hwhandler     = "1 emc",
                .selector      = DEFAULT_SELECTOR,
@@ -255,7 +255,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "HITACHI",
                .product       = "DF.*",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_hds_modular %d",
+               .getprio       = "/sbin/mpath_prio_hds_modular %d",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -292,7 +292,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "IBM",
                .product       = "1742",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_tpc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_tpc /dev/%n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -308,7 +308,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "IBM",
                .product       = "3526",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_tpc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_tpc /dev/%n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -356,7 +356,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "IBM",
                .product       = "1750500",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_alua /dev/%n",
+               .getprio       = "/sbin/mpath_prio_alua /dev/%n",
                .features      = "1 queue_if_no_path",
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -388,7 +388,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "IBM",
                .product       = "2145",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_alua /dev/%n",
+               .getprio       = "/sbin/mpath_prio_alua /dev/%n",
                .features      = "1 queue_if_no_path",
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -404,7 +404,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "IBM",
                .product       = "S/390 DASD ECKD",
                .bl_product       = "S/390.*",
-               .getuid        = "dasd_id /dev/%n",
+               .getuid        = "/sbin/dasd_id /dev/%n",
                .getprio       = NULL,
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
@@ -426,7 +426,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "NETAPP",
                .product       = "LUN.*",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_netapp /dev/%n",
+               .getprio       = "/sbin/mpath_prio_netapp /dev/%n",
                .features      = "1 queue_if_no_path",
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -447,7 +447,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "IBM",
                .product       = "Nseries.*",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_netapp /dev/%n",
+               .getprio       = "/sbin/mpath_prio_netapp /dev/%n",
                .features      = "1 queue_if_no_path",
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -468,7 +468,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "Pillar",
                .product       = "Axiom.*",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_alua %n",
+               .getprio       = "/sbin/mpath_prio_alua %n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -504,7 +504,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "SGI",
                .product       = "TP9[45]00",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_tpc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_tpc /dev/%n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
@@ -525,7 +525,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "STK",
                .product       = "OPENstorage D280",
                .getuid        = DEFAULT_GETUID,
-               .getprio       = "mpath_prio_tpc /dev/%n",
+               .getprio       = "/sbin/mpath_prio_tpc /dev/%n",
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,