diff options
Diffstat (limited to 'meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch index 8d1ed6671a..512e33aebf 100644 --- a/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch +++ b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 02acc4d875ee81e6fd19ef66d69c9f55b4b4a7e7 Mon Sep 17 00:00:00 2001 | 1 | From d1581ce103db0a5db0b1761907fff9ddd6b55a8a Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Wed, 9 Nov 2022 16:33:18 +0800 | 3 | Date: Wed, 9 Nov 2022 16:33:18 +0800 |
4 | Subject: [PATCH] 20-resolv.conf: improve the sitation of working with systemd | 4 | Subject: [PATCH] 20-resolv.conf: improve the sitation of working with systemd |
@@ -27,7 +27,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
27 | 1 file changed, 13 insertions(+), 4 deletions(-) | 27 | 1 file changed, 13 insertions(+), 4 deletions(-) |
28 | 28 | ||
29 | diff --git a/hooks/20-resolv.conf b/hooks/20-resolv.conf | 29 | diff --git a/hooks/20-resolv.conf b/hooks/20-resolv.conf |
30 | index 7c29e276..becc019f 100644 | 30 | index bd0b0df5..9c7721de 100644 |
31 | --- a/hooks/20-resolv.conf | 31 | --- a/hooks/20-resolv.conf |
32 | +++ b/hooks/20-resolv.conf | 32 | +++ b/hooks/20-resolv.conf |
33 | @@ -11,8 +11,12 @@ nocarrier_roaming_dir="$state_dir/roaming" | 33 | @@ -11,8 +11,12 @@ nocarrier_roaming_dir="$state_dir/roaming" |
@@ -59,7 +59,7 @@ index 7c29e276..becc019f 100644 | |||
59 | fi | 59 | fi |
60 | rm -f "$cf" | 60 | rm -f "$cf" |
61 | } | 61 | } |
62 | @@ -170,7 +179,7 @@ add_resolv_conf() | 62 | @@ -179,7 +188,7 @@ add_resolv_conf() |
63 | for x in ${new_domain_name_servers}; do | 63 | for x in ${new_domain_name_servers}; do |
64 | conf="${conf}nameserver $x$NL" | 64 | conf="${conf}nameserver $x$NL" |
65 | done | 65 | done |
@@ -68,7 +68,7 @@ index 7c29e276..becc019f 100644 | |||
68 | [ -n "$ifmetric" ] && export IF_METRIC="$ifmetric" | 68 | [ -n "$ifmetric" ] && export IF_METRIC="$ifmetric" |
69 | printf %s "$conf" | "$resolvconf" -a "$ifname" | 69 | printf %s "$conf" | "$resolvconf" -a "$ifname" |
70 | return $? | 70 | return $? |
71 | @@ -186,7 +195,7 @@ add_resolv_conf() | 71 | @@ -195,7 +204,7 @@ add_resolv_conf() |
72 | 72 | ||
73 | remove_resolv_conf() | 73 | remove_resolv_conf() |
74 | { | 74 | { |
@@ -77,6 +77,3 @@ index 7c29e276..becc019f 100644 | |||
77 | "$resolvconf" -d "$ifname" -f | 77 | "$resolvconf" -d "$ifname" -f |
78 | else | 78 | else |
79 | if [ -e "$resolv_conf_dir/$ifname" ]; then | 79 | if [ -e "$resolv_conf_dir/$ifname" ]; then |
80 | -- | ||
81 | 2.17.1 | ||
82 | |||