From 8a150a84a2dc1e726a46b018c8884de313479430 Mon Sep 17 00:00:00 2001
From: Olivier MEDOC <o_medoc@yahoo.fr>
Date: Wed, 8 Aug 2018 14:48:50 +0200
Subject: [PATCH] archlinux: ensure /usr/local is present in fstab (fix issue
 https://github.com/QubesOS/qubes-issues/issues/4196)

Complete fix of the issue https://github.com/QubesOS/qubes-issues/issues/1150 for archlinux
---
 archlinux/PKGBUILD         | 2 +-
 archlinux/PKGBUILD.install | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 86e3b15..8fa2d52 100644
--- a/archlinux/PKGBUILD
+++ b/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")
diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install
index ce625bb..bb6baf5 100644
--- a/archlinux/PKGBUILD.install
+++ b/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