Browse code

Merge "Few changes to get_uec_image.sh:"

Jenkins authored on 2012/11/08 22:25:45
Showing 1 changed files
... ...
@@ -5,7 +5,7 @@
5 5
 # Download and prepare Ubuntu UEC images
6 6
 
7 7
 CACHEDIR=${CACHEDIR:-/opt/stack/cache}
8
-ROOTSIZE=${ROOTSIZE:-2000}
8
+ROOTSIZE=${ROOTSIZE:-2000M}
9 9
 
10 10
 # Keep track of the current directory
11 11
 TOOLS_DIR=$(cd $(dirname "$0") && pwd)
... ...
@@ -24,7 +24,7 @@ usage() {
24 24
     echo "$0 [-r rootsize] release imagefile [kernel]"
25 25
     echo ""
26 26
     echo "-r size   - root fs size (min 2000MB)"
27
-    echo "release   - Ubuntu release: jaunty - oneric"
27
+    echo "release   - Ubuntu release: lucid - quantal"
28 28
     echo "imagefile - output image file"
29 29
     echo "kernel    - output kernel"
30 30
     exit 1
... ...
@@ -64,6 +64,8 @@ IMG_FILE_TMP=`mktemp $IMG_FILE.XXXXXX`
64 64
 KERNEL=$3
65 65
 
66 66
 case $DIST_NAME in
67
+    quantal)    ;;
68
+    percise)    ;;
67 69
     oneiric)    ;;
68 70
     natty)      ;;
69 71
     maverick)   ;;
... ...
@@ -90,7 +92,7 @@ fi
90 90
 
91 91
 # Get the UEC image
92 92
 UEC_NAME=$DIST_NAME-server-cloudimg-amd64
93
-if [ ! -d $CACHEDIR ]; then
93
+if [ ! -d $CACHEDIR/$DIST_NAME ]; then
94 94
     mkdir -p $CACHEDIR/$DIST_NAME
95 95
 fi
96 96
 if [ ! -e $CACHEDIR/$DIST_NAME/$UEC_NAME.tar.gz ]; then