From cec1003bfb1be7f833202821e61ebf025b9c03e8 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Mon, 19 Nov 2018 15:26:51 +0100
Subject: [PATCH] use /usr/local as rw

---
 pre-pivot.sh    | 1 +
 prepare-root.sh | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/pre-pivot.sh b/pre-pivot.sh
index a1d5bcc..6f92bf8 100644
--- a/pre-pivot.sh
+++ b/pre-pivot.sh
@@ -120,6 +120,7 @@ for i in var home cfg; do
     fi
 done
 
+[ -d /run/initramfs/mnt/local ] && mount -o bind /run/initramfs/mnt/local /sysroot/usr/local
 mount -o bind /run/initramfs/mnt/var /sysroot/var
 mount -o bind /run/initramfs/mnt/home /sysroot/home
 mount -o bind /run/initramfs/mnt/cfg /sysroot/cfg
diff --git a/prepare-root.sh b/prepare-root.sh
index 388c3ed..696931e 100755
--- a/prepare-root.sh
+++ b/prepare-root.sh
@@ -566,6 +566,15 @@ C /cfg/libvirt - - - - -
 EOF
 fi
 
+#---------------
+# usr/local
+mkdir -p "$sysroot"/usr/share/factory/usr/
+mv "$sysroot"/usr/local "$sysroot"/usr/share/factory/usr/local
+mkdir -p "$sysroot"/usr/local
+cat >> "$sysroot"/usr/lib/tmpfiles.d/usrlocal.conf <<EOF
+C /usr/local - - - - -
+EOF
+
 #---------------
 # brlapi
 # FIXME: reproducible