Merge pull request #168 from crazy-max/alpine-var-lock

ensure /var/lock dir exists
tonistiigi · Aug 20, 2024 · b4e4c45 · b4e4c45
2 parents a173e98 + b555f9b
commit b4e4c45
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/src/xx-apk b/src/xx-apk
@@ -3,6 +3,11 @@
 set -e
 
 if [ -z "$XX_APK_NOLOCK" ]; then
+  if [ -L /var/lock ] && [ ! -e "$(readlink -f /var/lock)" ]; then
+    mkdir -p "$(readlink -f /var/lock)"
+  elif [ ! -d /var/lock ]; then
+    mkdir -p /var/lock
+  fi
   lock="/var/lock/xx-apk"
   exec 9>$lock
   flock -x 9

diff --git a/src/xx-apt b/src/xx-apt
@@ -3,6 +3,11 @@
 set -e
 
 if [ -z "$XX_APT_NOLOCK" ]; then
+  if [ -L /var/lock ] && [ ! -e "$(readlink -f /var/lock)" ]; then
+    mkdir -p "$(readlink -f /var/lock)"
+  elif [ ! -d /var/lock ]; then
+    mkdir -p /var/lock
+  fi
   lock="/var/lock/xx-apt"
   exec 9>$lock
   flock -x 9

diff --git a/src/xx-cargo b/src/xx-cargo
@@ -10,6 +10,11 @@ execSilent() {
 }
 
 if [ -z "$XX_CARGO_NOLOCK" ]; then
+  if [ -L /var/lock ] && [ ! -e "$(readlink -f /var/lock)" ]; then
+    mkdir -p "$(readlink -f /var/lock)"
+  elif [ ! -d /var/lock ]; then
+    mkdir -p /var/lock
+  fi
   lock="/var/lock/xx-cargo"
   exec 9>$lock
   flock -x 9

diff --git a/src/xx-cc b/src/xx-cc
@@ -301,6 +301,11 @@ fi
 
 setup() {
   if [ -z "$XX_CC_NOLOCK" ]; then
+    if [ -L /var/lock ] && [ ! -e "$(readlink -f /var/lock)" ]; then
+      mkdir -p "$(readlink -f /var/lock)"
+    elif [ ! -d /var/lock ]; then
+      mkdir -p /var/lock
+    fi
     lock="/var/lock/xx-cc"
     exec 9>$lock
     flock -x 9

diff --git a/src/xx-verify b/src/xx-verify
@@ -3,6 +3,11 @@
 set -e
 
 if [ -z "$XX_VERIFY_NOLOCK" ]; then
+  if [ -L /var/lock ] && [ ! -e "$(readlink -f /var/lock)" ]; then
+    mkdir -p "$(readlink -f /var/lock)"
+  elif [ ! -d /var/lock ]; then
+    mkdir -p /var/lock
+  fi
   lock="/var/lock/xx-verify"
   exec 9>$lock
   flock -x 9