Merge pull request #187 from crazy-max/readlink-lock-fixes

fix with writing lock follow-ups

Author: tonistiigi

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

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

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

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

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