diff options
Diffstat (limited to 'meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch')
-rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch index c64b8aeabc..b435e6d677 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 49d0b0279f54ceb96878e8e72e828efbb84a534c Mon Sep 17 00:00:00 2001 | 1 | From 9f1075f82ecd39a9960f868eef890baf2ba36d4e Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Fri, 1 Mar 2024 11:45:10 +0800 | 3 | Date: Fri, 1 Mar 2024 11:45:10 +0800 |
4 | Subject: [PATCH 07/12] RH: warn on invalid regex instead of failing | 4 | Subject: [PATCH] RH: warn on invalid regex instead of failing |
5 | 5 | ||
6 | multipath.conf used to allow "*" as a match everything regular expression, | 6 | multipath.conf used to allow "*" as a match everything regular expression, |
7 | instead of requiring ".*". Instead of erroring when the old style | 7 | instead of requiring ".*". Instead of erroring when the old style |
@@ -23,7 +23,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
23 | 1 file changed, 34 insertions(+), 6 deletions(-) | 23 | 1 file changed, 34 insertions(+), 6 deletions(-) |
24 | 24 | ||
25 | diff --git a/libmultipath/dict.c b/libmultipath/dict.c | 25 | diff --git a/libmultipath/dict.c b/libmultipath/dict.c |
26 | index 5af036b7..e494419d 100644 | 26 | index a06a6138..a734ba9b 100644 |
27 | --- a/libmultipath/dict.c | 27 | --- a/libmultipath/dict.c |
28 | +++ b/libmultipath/dict.c | 28 | +++ b/libmultipath/dict.c |
29 | @@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr) | 29 | @@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr) |
@@ -61,7 +61,7 @@ index 5af036b7..e494419d 100644 | |||
61 | static int | 61 | static int |
62 | set_yes_no(vector strvec, void *ptr, const char *file, int line_nr) | 62 | set_yes_no(vector strvec, void *ptr, const char *file, int line_nr) |
63 | { | 63 | { |
64 | @@ -1798,7 +1826,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \ | 64 | @@ -1854,7 +1882,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \ |
65 | if (!conf->option) \ | 65 | if (!conf->option) \ |
66 | return 1; \ | 66 | return 1; \ |
67 | \ | 67 | \ |
@@ -70,7 +70,7 @@ index 5af036b7..e494419d 100644 | |||
70 | if (!buff) \ | 70 | if (!buff) \ |
71 | return 1; \ | 71 | return 1; \ |
72 | \ | 72 | \ |
73 | @@ -1818,7 +1846,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \ | 73 | @@ -1874,7 +1902,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \ |
74 | if (!conf->option) \ | 74 | if (!conf->option) \ |
75 | return 1; \ | 75 | return 1; \ |
76 | \ | 76 | \ |
@@ -79,7 +79,7 @@ index 5af036b7..e494419d 100644 | |||
79 | if (!buff) \ | 79 | if (!buff) \ |
80 | return 1; \ | 80 | return 1; \ |
81 | \ | 81 | \ |
82 | @@ -1924,16 +1952,16 @@ device_handler(struct config *conf, vector strvec, const char *file, | 82 | @@ -1980,16 +2008,16 @@ device_handler(struct config *conf, vector strvec, const char *file, |
83 | return 0; | 83 | return 0; |
84 | } | 84 | } |
85 | 85 | ||