[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/9] docker: debian-bootstrap.pre: print helpful mess
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 5/9] docker: debian-bootstrap.pre: print helpful message if DEB_ARCH/DEB_TYPE unset |
Date: |
Fri, 9 Sep 2016 13:52:19 +0800 |
From: Sascha Silbe <address@hidden>
The debian-bootstrap image doesn't choose a default architecture and
distribution version, instead the user has to set both DEB_ARCH and
DEB_TYPE in the environment. Print a reasonably helpful message if
either of them isn't set instead of complaining about "qemu-" being
missing or erroring out because we cannot cd to the mirror URL.
Signed-off-by: Sascha Silbe <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
tests/docker/dockerfiles/debian-bootstrap.pre | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre
b/tests/docker/dockerfiles/debian-bootstrap.pre
index 9b95a6b..3d9f7f4 100755
--- a/tests/docker/dockerfiles/debian-bootstrap.pre
+++ b/tests/docker/dockerfiles/debian-bootstrap.pre
@@ -15,6 +15,19 @@ exit_and_skip()
if [ -z $FAKEROOT ]; then
echo "Please install fakeroot to enable bootstraping" >&2
exit_and_skip
+
+fi
+
+if [ -z "${DEB_ARCH}" ]; then
+ echo "Please set DEB_ARCH to choose an architecture (e.g. armhf)" >&2
+ exit_and_skip
+
+fi
+
+if [ -z "${DEB_TYPE}" ]; then
+ echo "Please set DEB_TYPE to a Debian archive name (e.g. testing)" >&2
+ exit_and_skip
+
fi
# We check in order for
--
2.7.4
- [Qemu-devel] [PULL 0/9] Docker patches, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 1/9] docker: Add a glib2-2.22 image, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 2/9] docker.py: don't hang on large docker output, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 3/9] docker: avoid dependency on 'realpath' package, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 4/9] docker: debian-bootstrap.pre: print error messages to stderr, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 5/9] docker: debian-bootstrap.pre: print helpful message if DEB_ARCH/DEB_TYPE unset,
Fam Zheng <=
- [Qemu-devel] [PULL 6/9] docker: print warning if EXECUTABLE is not set when building debootstrap image, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 7/9] docker: make sure debootstrap is at least 1.0.67, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 9/9] docker: silence debootstrap when --quiet is given, Fam Zheng, 2016/09/09
- [Qemu-devel] [PULL 8/9] docker: build debootstrap after cloning, Fam Zheng, 2016/09/09
- Re: [Qemu-devel] [PULL 0/9] Docker patches, Peter Maydell, 2016/09/09