[Pkg-libvirt-commits] [libguestfs] 07/156: builder: ubuntu: Allow virt-install --os-variant to be specified on the command line.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit c48c9f9e6dab6a78d15ad81d74aaba165def915c
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat May 10 10:45:15 2014 +0100

    builder: ubuntu: Allow virt-install --os-variant to be specified on the command line.
    
    Current virt-builder in F20 does not know about --os-variant=ubuntutrusty
    so to build that you can now do:
    
      ./ubuntu.sh 14.04 trusty ubuntusaucy
    
    (cherry picked from commit a1fcd2ca5f24d4646b40408bbbaffb74fb20d9e6)
---
 builder/website/ubuntu.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/builder/website/ubuntu.sh b/builder/website/ubuntu.sh
index 9b9d443..9229c75 100755
--- a/builder/website/ubuntu.sh
+++ b/builder/website/ubuntu.sh
@@ -26,14 +26,16 @@ export LANG=C
 set -e
 set -x
 
-if [ $# -ne 2 ]; then
-    echo "$0 VERSION DIST"
+if [ $# -lt 2 -o $# -gt 3 ]; then
+    echo "$0 VERSION DIST [OSVARIANT]"
     exit 1
 fi
 
 # Some configuration.
 version=$1
 dist=$2
+osvariant=$3
+if [ -z "$osvariant" ]; then osvariant=ubuntu$dist; fi
 location=http://archive.ubuntu.net/ubuntu/dists/$dist/main/installer-amd64
 output=ubuntu-$version
 tmpname=tmp-$(tr -cd 'a-f0-9' < /dev/urandom | head -c 8)
@@ -61,7 +63,7 @@ trap cleanup INT QUIT TERM EXIT ERR
 virt-install \
     --name=$tmpname \
     --ram=1024 \
-    --os-type=linux --os-variant=ubuntu$dist \
+    --os-type=linux --os-variant=$osvariant \
     --initrd-inject=$(pwd)/preseed.cfg \
     --extra-args="auto console=tty0 console=ttyS0,115200" \
     --disk=$(pwd)/$output,size=4 \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git