Merge pull request #479 from sheldonh/master

Support swapless builders in minimize.sh
chef · Oct 19, 2015 · abd2c7b · abd2c7b
2 parents ec1a89a + 238b70b
commit abd2c7b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh
@@ -4,7 +4,13 @@ case "$PACKER_BUILDER_TYPE" in
   qemu) exit 0 ;;
 esac
 
+set +e
 swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`";
+case "$?" in
+	2|0) ;;
+	*) exit 1 ;;
+esac
+set -e
 
 if [ "x${swapuuid}" != "x" ]; then
     # Whiteout the swap partition to reduce box size