Merge remote-tracking branch 'qubesos/pr/130'

* qubesos/pr/130:
  archlinux: ensure /usr/local is present in fstab (fix issue https://github.com/QubesOS/qubes-issues/issues/4196)

archlinux/PKGBUILD

@@ -3,7 +3,7 @@
 # shellcheck disable=SC2034
 pkgname=(qubes-vm-core qubes-vm-networking qubes-vm-keyring)
 pkgver=$(cat version)
-pkgrel=14
+pkgrel=15
 epoch=
 pkgdesc="The Qubes core files for installation inside a Qubes VM."
 arch=("x86_64")

archlinux/PKGBUILD.install

@@ -86,6 +86,9 @@ update_qubesconfig() {
         mount /usr/local || :
     fi
 
+    # Fix fstab update to core-agent-linux 4.0.33
+    grep -F -q "/rw/usrlocal" /etc/fstab || sed "/\/rw\/home/a\/rw\/usrlocal    \/usr\/local  none    noauto,bind,defaults 0 0" -i /etc/fstab
+
     #/usr/lib/qubes/update-proxy-configs
     # Archlinux pacman configuration is handled in update_finalize