glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

Remove unused arguments from generic lxc template and introduce support for the rootfs param

Browse source
This commit is contained in:
Fabio Rehm 2013-09-19 18:24:08 -03:00
parent 076a9e38df
commit 50e82f61b1
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
boxes/common/lxc-template
View file

@ -112,12 +112,8 @@ post_process()
usage() usage()
{ {
cat <<EOF cat <<EOF
$1 -h|--help [-a|--arch] [--trim] [-d|--debug] $1 -h|--help [-a|--arch] [--trim] [-d|--debug] [--rootfs <rootfs>] [-T|--tarball <rootfs-tarball>
[-F | --flush-cache] [-r|--release <release>] [ -S | --auth-key <keyfile>]
release: the ubuntu release (e.g. precise): defaults to host release on ubuntu, otherwise uses latest LTS
trim: make a minimal (faster, but not upgrade-safe) container
arch: the container architecture (e.g. amd64): defaults to host arch arch: the container architecture (e.g. amd64): defaults to host arch
auth-key: SSH Public key file to inject into container
EOF EOF
return 0 return 0
} }
@ -162,12 +158,11 @@ while true
do do
case "$1" in case "$1" in
-h|--help) usage $0 && exit 0;; -h|--help) usage $0 && exit 0;;
--rootfs) rootfs=$2; shift 2;;
-p|--path) path=$2; shift 2;; -p|--path) path=$2; shift 2;;
-n|--name) name=$2; shift 2;; -n|--name) name=$2; shift 2;;
-T|--tarball) tarball=$2; shift 2;; -T|--tarball) tarball=$2; shift 2;;
-r|--release) release=$2; shift 2;;
-a|--arch) arch=$2; shift 2;; -a|--arch) arch=$2; shift 2;;
-x|--trim) trim_container=1; shift 1;;
-S|--auth-key) auth_key=$2; shift 2;; -S|--auth-key) auth_key=$2; shift 2;;
-d|--debug) debug=1; shift 1;; -d|--debug) debug=1; shift 1;;
--) shift 1; break ;; --) shift 1; break ;;
@ -179,7 +174,6 @@ if [ $debug -eq 1 ]; then
set -x set -x
fi fi
if [ "$arch" == "i686" ]; then if [ "$arch" == "i686" ]; then
arch=i386 arch=i386
fi fi
@ -201,10 +195,13 @@ fi
# detect rootfs # detect rootfs
config="$path/config" config="$path/config"
if grep -q '^lxc.rootfs' $config 2>/dev/null ; then # if $rootfs exists here, it was passed in with --rootfs
if [ -z "$rootfs" ]; then
if grep -q '^lxc.rootfs' $config 2>/dev/null ; then
rootfs=`grep 'lxc.rootfs =' $config | awk -F= '{ print $2 }'` rootfs=`grep 'lxc.rootfs =' $config | awk -F= '{ print $2 }'`
else else
rootfs=$path/rootfs rootfs=$path/rootfs
fi
fi fi
install_ubuntu $rootfs $release $tarball install_ubuntu $rootfs $release $tarball