From ea20a7988555ba170cc039d09f708e35f7c84b7d Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Mon, 27 Sep 2021 13:23:26 +0200
Subject: [PATCH] Experiment with flock for mutexing apk service ops

---
 experiments/alpine-standalone/etc_syndicate/packages.pr | 2 +-
 experiments/alpine-standalone/etc_syndicate/sshd.pr     | 2 +-
 experiments/alpine-standalone/init.sh                   | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/experiments/alpine-standalone/etc_syndicate/packages.pr b/experiments/alpine-standalone/etc_syndicate/packages.pr
index dbe8a62..d38a68e 100644
--- a/experiments/alpine-standalone/etc_syndicate/packages.pr
+++ b/experiments/alpine-standalone/etc_syndicate/packages.pr
@@ -1,3 +1,3 @@
 <require-service <daemon core-packages>>
 <depends-on <daemon core-packages> <service-running <milestone network>>>
-<daemon core-packages "apk add $(cat /package-list)">
+<daemon core-packages "flock /var/lock/synit/apk apk add $(cat /package-list)">
diff --git a/experiments/alpine-standalone/etc_syndicate/sshd.pr b/experiments/alpine-standalone/etc_syndicate/sshd.pr
index cc97c03..741d9e2 100644
--- a/experiments/alpine-standalone/etc_syndicate/sshd.pr
+++ b/experiments/alpine-standalone/etc_syndicate/sshd.pr
@@ -7,4 +7,4 @@
 <depends-on <daemon ssh-host-keys> <service-running <daemon <install openssh>>>>
 <daemon ssh-host-keys "ssh-keygen -A">
 
-<daemon <install openssh> "apk add openssh">
+<daemon <install openssh> "flock /var/lock/synit/apk apk add openssh">
diff --git a/experiments/alpine-standalone/init.sh b/experiments/alpine-standalone/init.sh
index d87ed49..e03af3f 100644
--- a/experiments/alpine-standalone/init.sh
+++ b/experiments/alpine-standalone/init.sh
@@ -78,6 +78,9 @@ then
     mkdir -p ${NEWROOT}/run/etc/syndicate
     mkdir -p ${NEWROOT}/usr/local/etc/syndicate
 
+    echo "Setting up locking directories."
+    mkdir -p ${NEWROOT}/var/lock/synit
+
     echo "Killing leftovers."
     kill -15 -1
     sleep 0.2