systemd-resolved integration

3 files changed, 5 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4b69406cdeb..e3036a093d59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lokinet
 	pkgdesc = Anonymous, decentralized and IP based overlay network for the internet.
 	pkgver = 0.8.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://lokinet.org
 	install = lokinet.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 2fe677204782..338d990b2e6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: nekgem2 <nekgem2@firemail.cc>
 pkgname=lokinet
 pkgver=0.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Anonymous, decentralized and IP based overlay network for the internet."
 arch=('x86_64' 'aarch64')
 url="https://lokinet.org"
@@ -53,6 +53,7 @@ build() {
 package() {
 	cd "lokinet-v$pkgver"
 	install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -Dm755 contrib/systemd-resolved/lokinet.conf "$pkgdir/usr/lib/systemd/resolved.conf.d/00-lokinet.conf"
 	cd build
 	make DESTDIR="$pkgdir" install
 
diff --git a/lokinet.install b/lokinet.install
index 7feaaa338b4a..290a095bf29b 100644
--- a/lokinet.install
+++ b/lokinet.install
@@ -1,14 +1,13 @@
 
 post_install() {
 	cat <<-EOF
-		  systemd-resolved is known to cause issues with lokinet so it's recommended to disable it:
-		    systemctl disable --now systemd-resolved
 		  To generate default config (optional, will be invoked by lokinet service if needed):
 		    systemctl start lokinet-default-config
 		  To adjust upstream DNS servers and other options, edit /var/lib/lokinet/lokinet.ini
 		  To start lokinet:
 		    systemctl start lokinet
-		  To get .loki domains resolve, replace /etc/resolv.conf contents with:
+		  To get .loki domains resolve, enable systemd-resolved: https://wiki.archlinux.org/index.php/Systemd-resolved
+		  Alternatively, replace /etc/resolv.conf contents with:
 		    nameserver 127.3.2.1
 		EOF
 }