From: Guilhem Lettron <guilhem.lettron@optiflows.com>
Date: Wed, 13 Nov 2013 13:22:10 +0000 (+0100)
Subject: lxc-ubuntu: Add mirror and security-mirror options
X-Git-Tag: lxc-1.0.0.beta1~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eb28ae492ee7417c458695e410e6d3a526c56e1;p=thirdparty%2Flxc.git

lxc-ubuntu: Add mirror and security-mirror options

Signed-off-by: Guilhem Lettron <guilhem.lettron@optiflows.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index b0a8e5afc..68958268a 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -243,7 +243,7 @@ download_ubuntu()
     arch=$2
     release=$3
 
-    packages_template="ssh"
+    packages_template=${packages_template:-"ssh"}
 
     # Try to guess a list of langpacks to install
     langpacks="language-pack-en"
@@ -593,7 +593,7 @@ EOF
     return 0
 }
 
-options=$(getopt -o a:b:hp:r:n:FS:du: -l arch:,bindhome:,help,path:,release:,name:,flush-cache,auth-key:,debug,rootfs:,packages:,user:,password: -- "$@")
+options=$(getopt -o a:b:hp:r:n:FS:du: -l arch:,bindhome:,help,path:,release:,name:,flush-cache,auth-key:,debug,rootfs:,packages:,user:,password:,mirror:,security-mirror: -- "$@")
 if [ $? -ne 0 ]; then
     usage $(basename $0)
     exit 1
@@ -648,6 +648,8 @@ do
     -a|--arch)      arch=$2; shift 2;;
     -S|--auth-key)  auth_key=$2; shift 2;;
     -d|--debug)     debug=1; shift 1;;
+    --mirror)       MIRROR=$2; shift 2;;
+    --security-mirror) SECURITY_MIRROR=$2; shift 2;;
     --)             shift 1; break ;;
         *)              break ;;
     esac