From 18f973ce0054f96c4e6aad668a15bb5efdbddbe5 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <urpylka@gmail.com>
Date: Mon, 24 Sep 2018 17:13:26 +0300
Subject: [PATCH] image_builder: debug

---
 .travis.yml                    |  3 +--
 builder_docker/image-chroot.sh | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5554506c..95f39c9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,7 @@ git:
 before_script:
   - docker pull ${DOCKER}
 script:
-  - [[ -z ${TRAVIS_TAG} ]] || exit 1
-  - docker run --privileged --rm -v /dev:/dev -v ${BUILD_DIR}:/builder/image -e "TARGET_REPO=${TARGET_REPO}" -e "TARGET_REF=${TARGET_REF}" ${DOCKER}
+  - if [[ ! -z $TRAVIS_TAG ]]; then docker run --privileged --rm -v /dev:/dev -v ${BUILD_DIR}:/builder/image -e "TARGET_REPO=${TARGET_REPO}" -e "TARGET_REF=${TARGET_REF}" ${DOCKER}; fi
 # after_failure:
 #   - skip_deploy: true
 before_deploy:
diff --git a/builder_docker/image-chroot.sh b/builder_docker/image-chroot.sh
index c7f926fe..4d36a672 100755
--- a/builder_docker/image-chroot.sh
+++ b/builder_docker/image-chroot.sh
@@ -59,11 +59,10 @@ execute() {
   echo_stamp "Mounting /proc in chroot... "
   if [ ! -d ${MOUNT_POINT}/proc ]; then
     mkdir -p ${MOUNT_POINT}/proc \
-    && mount -t proc -o nosuid,noexec,nodev proc ${MOUNT_POINT}/proc
+    && mount -t proc -o nosuid,noexec,nodev proc ${MOUNT_POINT}/proc \
     && echo_stamp "OK" "SUCCESS" \
     || (echo_stamp "Failed" "ERROR"; exit 1)
-  else echo_stamp "/sys already exist" "SUCCESS"
-  fi
+  else echo_stamp "/proc already exist" "SUCCESS"; fi
 
   echo_stamp "Mounting /sys in chroot... "
   if [ ! -d ${MOUNT_POINT}/sys ]; then
@@ -71,8 +70,7 @@ execute() {
     &&   mount -t sysfs -o nosuid,noexec,nodev sysfs ${MOUNT_POINT}/sys \
     && echo_stamp "OK" "SUCCESS" \
     || (echo_stamp "Failed" "ERROR"; exit 1)
-  else echo_stamp "/sys already exist" "SUCCESS"
-  fi
+  else echo_stamp "/sys already exist" "SUCCESS"; fi
 
   echo_stamp "Mounting /dev/ and /dev/pts in chroot... " \
   && mkdir -p -m 755 ${MOUNT_POINT}/dev/pts \
@@ -126,7 +124,7 @@ umount_system() {
   # Repeat 5 times
   for i in {1..5}; do
     umount -fR $1 \
-    && (echo_stamp "OK" "SUCCESS"; umount_ok=true; break)
+    && (echo_stamp "OK" "SUCCESS"; umount_ok=true; break) \
     || (echo_stamp "Failed #$i (try 5 times)" "ERROR"; sleep 2)
   done
   [[ "$umount_ok" == true ]] \