[libmultipath] remove absolete multipath_tool config keyword

multipathd used to call multipath(8), thus needed to know the callout path.
This is no longer the case, so clean it up.

diff --git a/libmultipath/config.c b/libmultipath/config.c
index 9f6c86d957e93bb20908f38a11ec46f6b864f9c1..1a94696830dcf311cdb80dd4254b9ab54c724176 100644 (file)
--- a/libmultipath/config.c
+++ b/libmultipath/config.c
@@ -309,9 +309,6 @@ free_config (struct config * conf)
        if (conf->dev)
                FREE(conf->dev);
 
-       if (conf->multipath)
-               FREE(conf->multipath);
-
        if (conf->udev_dir)
                FREE(conf->udev_dir);
 

diff --git a/libmultipath/config.h b/libmultipath/config.h
index 6d8369cf563048ebe766e609004f81c7f323fed1..257ca39444f625d23a72e5ffcfc378338b764baf 100644 (file)
--- a/libmultipath/config.h
+++ b/libmultipath/config.h
@@ -57,7 +57,6 @@ struct config {
        int rr_weight;
 
        char * dev;
-       char * multipath;
        char * udev_dir;
        char * default_selector;
        char * default_getuid;

diff --git a/libmultipath/dict.c b/libmultipath/dict.c
index 8e74b5be8fbc050df039bd69a74012ebf5937fe8..4ee4ac41154e2e49126285bb160b6b30a964b94e 100644 (file)
--- a/libmultipath/dict.c
+++ b/libmultipath/dict.c
@@ -13,17 +13,6 @@
 /*
  * default block handlers
  */
-static int
-multipath_tool_handler(vector strvec)
-{
-       conf->multipath = set_value(strvec);
-
-       if (!conf->multipath)
-               return 1;
-
-       return 0;
-}
-
 static int
 polling_interval_handler(vector strvec)
 {
@@ -581,7 +570,6 @@ init_keywords(void)
 
        install_keyword_root("defaults", NULL);
        install_keyword("polling_interval", &polling_interval_handler);
-       install_keyword("multipath_tool", &multipath_tool_handler);
        install_keyword("udev_dir", &udev_dir_handler);
        install_keyword("default_selector", &def_selector_handler);
        install_keyword("default_path_grouping_policy", &def_pgpolicy_handler);

diff --git a/multipath.conf.annotated b/multipath.conf.annotated
index 1e3d9dc660666d2bb52038b1e6c91e2cdd82c0b0..864a8554ba278ed8d2791b0cc41911e07052a181 100644 (file)
--- a/multipath.conf.annotated
+++ b/multipath.conf.annotated
@@ -9,14 +9,6 @@
 ##
 #defaults {
 #      #
-#      # name    : multipath_tool
-#      # scope   : multipathd
-#      # desc    : the tool in charge of configuring the multipath device maps
-#      # default : "/sbin/multipath -v0"
-#      #
-#      multipath_tool  "/sbin/multipath -v0"
-#
-#      #
 #      # name    : udev_dir
 #      # desc    : directory where udev creates its device nodes
 #      # default : /udev

diff --git a/multipath.conf.synthetic b/multipath.conf.synthetic
index 56ade6a18b5c692034dcd9c973a4f4a1372b50b3..616fceb0519c9d814efa6205be870587ce876b5a 100644 (file)
--- a/multipath.conf.synthetic
+++ b/multipath.conf.synthetic
@@ -3,7 +3,6 @@
 ## Uncomment the lines relevent to your environment
 ##
 #defaults {
-#      multipath_tool  "/sbin/multipath -v0"
 #      udev_dir        /dev
 #      polling_interval 10
 #      default_selector        "round-robin 0"