summaryrefslogtreecommitdiff
path: root/contrib/mkimage-arch.sh
diff options
context:
space:
mode:
authorBartłomiej Piotrowski <b@bpiotrowski.pl>2014-01-06 13:08:55 +0100
committerBartłomiej Piotrowski <b@bpiotrowski.pl>2014-01-21 14:21:43 +0100
commitc138c335a5d867d81231fdca6f418a9cc11ca244 (patch)
tree467addbfe931cf140986ce03c7d36ec5db0b6e70 /contrib/mkimage-arch.sh
parent2a1181f404387f6d530a86a6196b40a6dd541c20 (diff)
downloaddocker-c138c335a5d867d81231fdca6f418a9cc11ca244.tar.gz
mkimage-arch: use mktemp to create ROOTFS directory
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Diffstat (limited to 'contrib/mkimage-arch.sh')
-rwxr-xr-xcontrib/mkimage-arch.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/mkimage-arch.sh b/contrib/mkimage-arch.sh
index db14e8674e..d9e911474e 100755
--- a/contrib/mkimage-arch.sh
+++ b/contrib/mkimage-arch.sh
@@ -4,19 +4,19 @@
# requires root
set -e
-PACSTRAP=$(which pacstrap)
+PACSTRAP=$(hash pacstrap &>/dev/null)
[ "$PACSTRAP" ] || {
echo "Could not find pacstrap. Run pacman -S arch-install-scripts"
exit 1
}
-EXPECT=$(which expect)
-[ "$EXPECT" ] || {
+
+EXPECT=$(hash expect &>/dev/null)
+[[ "$EXPECT" ]] || {
echo "Could not find expect. Run pacman -S expect"
exit 1
}
-ROOTFS=~/rootfs-arch-$$-$RANDOM
-mkdir $ROOTFS
+ROOTFS=$(mktemp -d /tmp/rootfs-archlinux-XXXXXXXXXX)
#packages to ignore for space savings
PKGIGNORE=linux,jfsutils,lvm2,cryptsetup,groff,man-db,man-pages,mdadm,pciutils,pcmciautils,reiserfsprogs,s-nail,xfsprogs