fix with writing lock follow-ups

Signed-off-by: CrazyMax <[email protected]>
tonistiigi · Dec 10, 2024 · 0efd196 · 0efd196
1 parent 8cec517
commit 0efd196
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/src/xx-apk b/src/xx-apk
@@ -4,13 +4,13 @@ set -e
 
 if [ -z "$XX_APK_NOLOCK" ]; then
   # readlink -f in ash can not resolve symlinks from deep workdir
-  cd /
+  cd / >/dev/null
   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
-  cd -
+  cd - >/dev/null
   lock="/var/lock/xx-apk"
   exec 9>$lock
   flock -x 9

diff --git a/src/xx-apt b/src/xx-apt
@@ -3,11 +3,14 @@
 set -e
 
 if [ -z "$XX_APT_NOLOCK" ]; then
+  # readlink -f in ash can not resolve symlinks from deep workdir
+  cd / >/dev/null
   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
+  cd - >/dev/null
   lock="/var/lock/xx-apt"
   exec 9>$lock
   flock -x 9

diff --git a/src/xx-cargo b/src/xx-cargo
@@ -10,11 +10,14 @@ execSilent() {
 }
 
 if [ -z "$XX_CARGO_NOLOCK" ]; then
+  # readlink -f in ash can not resolve symlinks from deep workdir
+  cd / >/dev/null
   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
+  cd - >/dev/null
   lock="/var/lock/xx-cargo"
   exec 9>$lock
   flock -x 9

diff --git a/src/xx-cc b/src/xx-cc
@@ -301,11 +301,14 @@ fi
 
 setup() {
   if [ -z "$XX_CC_NOLOCK" ]; then
+    # readlink -f in ash can not resolve symlinks from deep workdir
+    cd / >/dev/null
     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
+    cd - >/dev/null
     lock="/var/lock/xx-cc"
     exec 9>$lock
     flock -x 9

diff --git a/src/xx-verify b/src/xx-verify
@@ -3,11 +3,14 @@
 set -e
 
 if [ -z "$XX_VERIFY_NOLOCK" ]; then
+  # readlink -f in ash can not resolve symlinks from deep workdir
+  cd / >/dev/null
   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
+  cd - >/dev/null
   lock="/var/lock/xx-verify"
   exec 9>$lock
   flock -x 9