Fix s390x image creation

Author: malbarbo

.travis.yml

@@ -2,6 +2,13 @@ language: rust
 rust: stable
 sudo: required
 dist: trusty
+addons:
+  apt:
+    packages:
+      # register qemu interpreters because inside docker it is not possible
+      # it is required by qemu-debootstrap (used by s390x)
+      - binfmt-support
+      - qemu-user-static
 services:
   - docker
 install:

ci/docker/s390x-unknown-linux-gnu/Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev \
         gcc-s390x-linux-gnu libc6-dev-s390x-cross \
         debian-archive-keyring debootstrap cpio \
-        qemu-user-static qemu-system-s390x \
+        binfmt-support qemu-user-static qemu-system-s390x \
         sshpass openssh-client
 
 COPY linux-image.sh /

ci/linux-image.sh

@@ -24,7 +24,7 @@ qemu-debootstrap \
 rm -f $dest/var/lib/dpkg/status
 mv $dest/bin/mount /mount.bak
 cp $dest/bin/true $dest/bin/mount
-chroot $dest /debootstrap/debootstrap --second-stage
+chroot $dest /debootstrap/debootstrap --second-stage || cat $dest//debootstrap/debootstrap.log && false
 mv -f /mount.bak $dest/bin/mount
 
 # ssh