From 168c41e8e384674ac16cb2f9d23d14e0c3f17878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Mon, 19 Oct 2020 15:41:18 +0200 Subject: [PATCH] Fix networking and remove qrexec pam related --- archlinux/PKGBUILD | 1 + archlinux/PKGBUILD.install | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index cd93daf..4b881a5 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -125,6 +125,7 @@ package_qubes-vm-networking() { install=PKGBUILD-networking.install # shellcheck disable=SC2154 + make -C network install DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SYSTEM_DROPIN_DIR=/usr/lib/systemd/system USER_DROPIN_DIR=/usr/lib/systemd/user DIST=archlinux make install-netvm DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SYSTEM_DROPIN_DIR=/usr/lib/systemd/system USER_DROPIN_DIR=/usr/lib/systemd/user DIST=archlinux } diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index 673af66..b6e199a 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -318,17 +318,6 @@ update_finalize() { /usr/lib/qubes/update-proxy-configs - # Archlinux specific: Update pam.d configuration for su to enable systemd-login wrapper - # This is required as qubes-gui agent calls xinit with su -l user without initializing properly - # the user session. - # pam_unix.so can also be removed from su configuration - # as system-login (which include system-auth) already gives pam_unix.so - # with more appropriate parameters (fix the missing nullok parameter) - if grep -q pam_unix.so /etc/pam.d/su; then - echo "Fixing pam.d" - cp /etc/pam.d/qrexec /etc/pam.d/su-l - fi - # Archlinux specific: ensure tty1 is enabled rm -f /etc/systemd/system/getty.target.wants/getty@tty*.service systemctl enable getty\@tty1.service