Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(root/docker): update resolvconf.patch 

Should apply properly now.
This commit is contained in:
Sylirre 2024-02-01 21:07:29 +02:00
parent f1b0d1e64c
commit 7b253ac2ce
No known key found for this signature in database
GPG Key ID: D3611414834B814C
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
root-packages/docker/resolvconf.patch
View File

@ -60,21 +60,6 @@ diff -uNr src.orig/moby/daemon/container_operations_unix.go moby/daemon/containe
)
default:
// For other situations, such as the default bridge network, container
diff -uNr src.orig/moby/libnetwork/resolvconf/resolvconf.go moby/libnetwork/resolvconf/resolvconf.go
--- src.orig/moby/libnetwork/resolvconf/resolvconf.go 2023-08-29 22:14:17.000000000 +0300
+++ moby/libnetwork/resolvconf/resolvconf.go 2024-02-01 20:32:31.457173805 +0200
@@ -13,9 +13,9 @@
const (
// defaultPath is the default path to the resolv.conf that contains information to resolve DNS. See Path().
- defaultPath = "/etc/resolv.conf"
+ defaultPath = "@TERMUX_PREFIX@/etc/resolv.conf"
// alternatePath is a path different from defaultPath, that may be used to resolve DNS. See Path().
- alternatePath = "/run/systemd/resolve/resolv.conf"
+ alternatePath = "/etc/resolv.conf"
)
// constants for the IP address type
diff -uNr src.orig/moby/plugin/v2/plugin_linux.go moby/plugin/v2/plugin_linux.go
--- src.orig/moby/plugin/v2/plugin_linux.go 2023-08-29 22:14:17.000000000 +0300
+++ moby/plugin/v2/plugin_linux.go 2024-02-01 20:27:35.648186687 +0200