1 files changed, 8 insertions, 11 deletions

diff --git a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
index 54b3bdc863..649f1fa778 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
@@ -1,7 +1,7 @@
-From de8ee3480ec7479ed014c197a9d747403f6e0237 Mon Sep 17 00:00:00 2001
+From 2fe1037b8198bd00961d8df48e684296758127d1 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Fri, 23 Nov 2018 17:25:15 +0800
-Subject: [PATCH 03/12] RH: don't start without a config file
+Subject: [PATCH] RH: don't start without a config file
 
 If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist
 all devices when running multipath.  A completely blank configuration file
@@ -28,7 +28,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  5 files changed, 23 insertions(+)
 
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index 83fa7369..8a3a8f37 100644
+index 8b424d18..d8fafa1f 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
 @@ -26,6 +26,7 @@
@@ -39,7 +39,7 @@ index 83fa7369..8a3a8f37 100644
  
  /*
   * We don't support re-initialization after
-@@ -959,6 +960,23 @@ int _init_config (const char *file, struct config *conf)
+@@ -937,6 +938,23 @@ int init_config__ (const char *file, struct config *conf)
                 }
                 factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
                 validate_pctable(conf->overrides, 0, file);
@@ -64,7 +64,7 @@ index 83fa7369..8a3a8f37 100644
  
         conf->processed_main_config = 1;
 diff --git a/libmultipath/config.h b/libmultipath/config.h
-index 384193ab..158cebf0 100644
+index 5b4ebf8c..2302eacc 100644
 --- a/libmultipath/config.h
 +++ b/libmultipath/config.h
 @@ -10,6 +10,7 @@
@@ -76,7 +76,7 @@ index 384193ab..158cebf0 100644
  enum devtypes {
         DEV_NONE,
 diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in
-index 780bf852..2c518378 100644
+index 2ac1972f..cc248231 100644
 --- a/multipath/multipath.rules.in
 +++ b/multipath/multipath.rules.in
 @@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath"
@@ -88,7 +88,7 @@ index 780bf852..2c518378 100644
  ENV{DEVTYPE}!="partition", GOTO="test_dev"
  IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH"
 diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in
-index f1cab3ff..5ae21db1 100644
+index 7bc8806e..315884eb 100644
 --- a/multipathd/multipathd.8.in
 +++ b/multipathd/multipathd.8.in
 @@ -49,6 +49,8 @@ map regains its maximum performance and redundancy.
@@ -101,7 +101,7 @@ index f1cab3ff..5ae21db1 100644
  .
  .\" ----------------------------------------------------------------------------
 diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in
-index 6d03ff71..0cd85102 100644
+index b6a25b31..f78bb91b 100644
 --- a/multipathd/multipathd.service.in
 +++ b/multipathd/multipathd.service.in
 @@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target
@@ -112,6 +112,3 @@ index 6d03ff71..0cd85102 100644
  Before=initrd-cleanup.service
  DefaultDependencies=no
  Conflicts=shutdown.target
--- 
-2.25.1
-