986c0a7d5e
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
--- a/src/resolve.c
|
|
+++ b/src/resolve.c
|
|
@@ -596,7 +596,7 @@ static int resolve_init(void)
|
|
method_name = l_settings_get_value(iwd_get_config(), "Network",
|
|
"NameResolvingService");
|
|
if (!method_name)
|
|
- method_name = "systemd";
|
|
+ method_name = "resolvconf";
|
|
|
|
for (i = 0; resolve_method_ops_list[i].name; i++) {
|
|
if (strcmp(resolve_method_ops_list[i].name, method_name))
|
|
--- a/src/iwd.config.rst
|
|
+++ b/src/iwd.config.rst
|
|
@@ -194,7 +194,7 @@ The group ``[Network]`` contains network configuration related settings.
|
|
by default. This setting can also be overriden on a per-network basis.
|
|
|
|
* - NameResolvingService
|
|
- - Values: resolvconf, **systemd**
|
|
+ - Values: **resolvconf**, systemd
|
|
|
|
Configures a DNS resolution method used by the system.
|
|
|
|
@@ -202,7 +202,7 @@ The group ``[Network]`` contains network configuration related settings.
|
|
``EnableNetworkConfiguration`` and provides the choice of system
|
|
resolver integration.
|
|
|
|
- If not specified, ``systemd`` is used as default.
|
|
+ If not specified, ``resolvconf`` is used as default.
|
|
|
|
* - RoutePriorityOffset
|
|
- Values: uint32 value (default: **300**)
|