From 4638df2a9ad4e37713c97faac00358a36b6e7444 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Thu, 19 Jan 2017 14:28:48 +0000
Subject: [PATCH] Remove annoying output of dd

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 alpine/Makefile                      | 8 ++++----
 alpine/base/pad4/pad4.sh             | 4 +++-
 alpine/base/tar2initrd/tar2initrd.sh | 4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/alpine/Makefile b/alpine/Makefile
index dea384178..a8dad745b 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -16,11 +16,11 @@ FORCE_GSUTIL_AUTH ?= 1
 # Tag: 22b043cb43f6bc3bc4e1f1ecf9d64932f9325642
 BIOS_IMAGE=mobylinux/mkimage-iso-bios@sha256:7e28f7745fd62284142dce59a137c3331f7673efe8b3f19ee5c65e4cc27ff18c
 
-# Tag: c6c904f82ec47594f7b1a26a76013cd7a53356d8
-PAD4_IMAGE=mobylinux/pad4@sha256:0963843b484faa021dc99f67bdfd01c9c1721621fffcf343a68151ae074b2206
+# Tag: 1edffcbfa13d4795f006d38e871a778ffba03d8a
+PAD4_IMAGE=mobylinux/pad4@sha256:1ad26970698670373ee0bf374a06900f712a61b8038255e78271b840a1267b25
 
-# Tag: 5bcb6d6154f03617405f9fed9346e8e607acfc75
-TAR2INITRD_IMAGE=mobylinux/tar2initrd@sha256:f9aa2508e6d53d4f7c9296ba273dea37960c544333ca2241d78dc1f8a5f6c963
+# Tag: d5711601eb5b89de0f052d87365e18388ff3f1b5
+TAR2INITRD_IMAGE=mobylinux/tar2initrd@sha256:58d377e65845f91400e173ce9fca93462f2f237947eef2b0d2c17bb4f2da5ee8
 
 # Tag: 77bc577875fb3a80ac2d14b70d1daa885bbf199c
 GCE_IMAGE=mobylinux/mkimage-gce@sha256:f9abf2eae20984b7dd3c1afb700b2c9c41e39e6e7c688c78348a51d0780d74cc
diff --git a/alpine/base/pad4/pad4.sh b/alpine/base/pad4/pad4.sh
index b14c84037..7be8eaf92 100755
--- a/alpine/base/pad4/pad4.sh
+++ b/alpine/base/pad4/pad4.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 cd /tmp
 
 cat > initrd.img
@@ -9,7 +11,7 @@ SIZE4=$(( $SIZE / 4 \* 4 ))
 DIFF=$(( $SIZE - $SIZE4 ))
 [ $DIFF -ne 0 ] && DIFF=$(( 4 - $DIFF ))
 
-dd if=/dev/zero bs=1 count=$DIFF of=zeropad
+dd if=/dev/zero bs=1 count=$DIFF of=zeropad 2>/dev/null
 
 cat zeropad >> initrd.img
 
diff --git a/alpine/base/tar2initrd/tar2initrd.sh b/alpine/base/tar2initrd/tar2initrd.sh
index e2f25cb11..9dccc3ef6 100755
--- a/alpine/base/tar2initrd/tar2initrd.sh
+++ b/alpine/base/tar2initrd/tar2initrd.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 mkdir -p /tmp/input
 
 cd /tmp/input
@@ -15,7 +17,7 @@ SIZE4=$(( $SIZE / 4 \* 4 ))
 DIFF=$(( $SIZE - $SIZE4 ))
 [ $DIFF -ne 0 ] && DIFF=$(( 4 - $DIFF ))
 
-dd if=/dev/zero bs=1 count=$DIFF of=zeropad
+dd if=/dev/zero bs=1 count=$DIFF of=zeropad 2>/dev/null
 
 cat zeropad >> initrd.img