Browse Source

Fix networking and remove qrexec pam related

Frédéric Pierret (fepitre) 3 years ago
parent
commit
168c41e8e3
2 changed files with 1 additions and 11 deletions
  1. 1 0
      archlinux/PKGBUILD
  2. 0 11
      archlinux/PKGBUILD.install

+ 1 - 0
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
 
 }

+ 0 - 11
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