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)
This commit is contained in:
Marek Marczykowski-Górecki 2018-08-09 02:26:35 +02:00
commit b2fccfef86
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 4 additions and 1 deletions

View File

@ -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")

View File

@ -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