postmarketos-base-ui: prioritize DNS for networkmanager

fixes #1430
2022-02-17 21:50:09 -08:00
2 changed files with 22 additions and 2 deletions
@@ -1,7 +1,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-base-ui
-pkgver=4
-pkgrel=3
+pkgver=5
+pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -37,6 +37,7 @@ replaces_priority=100  # leave plenty for alpine

 _source644="
 	etc/NetworkManager/conf.d/hostname-mode.conf
+	etc/NetworkManager/conf.d/dns-priority.conf
 	etc/chrony/chrony.conf
 	etc/conf.d/tinydm
 	etc/conf.d/wpa_supplicant
@@ -123,6 +124,7 @@ networkmanager() {

 sha512sums="
 3c9ae7415f4891bee8595166ed6a42cb577a837f741c6b5409d193558626348b41516888a01d0c4895282c5f4e9a1ff838c19712888750b2ef68429bb4b42ee3  rootfs-etc-NetworkManager-conf.d-hostname-mode.conf
+2418262c4e9f7459515eec4ba66b2153254814e868dc31605f04c72fec108769f350b5838dc8ec273edaea798a411d0a92be5bd31f7839debd81b6f11cc47193  rootfs-etc-NetworkManager-conf.d-dns-priority.conf
 e5d049db1d82c510bab9246208b51b8ec2711d008d67792fc10d4c0b65ed4dece7b5ae3c3dd28a8539d177b6849c1f921cb9fef3d2c7bee0355451f7b4757ec6  rootfs-etc-chrony-chrony.conf
 44e4283c6f77de83915977dd3bc2d8e2d96b3ed6cc68d3cc156304359ae649b5a8b0bac843e517ec6faa2066dd43ba85e313899b1eda04862f864fb9eb508aa0  rootfs-etc-conf.d-tinydm
 fe0651904c1f40ffa67d83daca190af199f63247e53642a59a1e1147cd06776fcf20b7b2fcc5373783d50b8bd6ce8d1354c8e5f4d582d319727b9ceefd1e8e16  rootfs-etc-conf.d-wpa_supplicant
@@ -0,0 +1,18 @@
+# Set DNS to *only* nameservers from wifi or ethernet if they are connected,
+# ignoring gsm/wwan.
+# A negative priority causes NM to only list nameservers for the connection.
+# also see: https://gitlab.com/postmarketOS/pmaports/-/issues/1430
+
+[connection-preferred]
+match-device=type:wifi,type:ethernet
+ipv4.route-metric=-10
+ipv4.dns-priority=-10
+ipv6.route-metric=-10
+ipv6.dns-priority=-10
+
+[connection-wwan]
+match-device=type:gsm
+ipv4.route-metric=100
+ipv4.dns-priority=100
+ipv6.route-metric=100
+ipv6.dns-priority=100