proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-07 16:59:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ubuntu templates cleanups

Browse Source 
1. fix inconsistent use of '--auth-key' (not --auth_key) which broke their
   usage
2. add --debug option to lxc-ubuntu (which does set -x to show what broke)
   (idea from Idea from lifeless and benji)
3. fix incorrect assumption about group with -b option.  User's default group
   may not be the same as username.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Serge Hallyn 2012-03-19 00:31:40 +01:00 committed by Daniel Lezcano
parent 69182a318c
commit 52c8f624b5
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
templates/lxc-ubuntu-cloud.in
View File

@ -104,18 +104,19 @@ Generic Options
[ -a | --arch ]: Arhcitecture of container, defaults to host arcitecture [ -a | --arch ]: Arhcitecture of container, defaults to host arcitecture
[ -C | --cloud ]: Configure container for use with meta-data service, defaults to no [ -C | --cloud ]: Configure container for use with meta-data service, defaults to no
[ -T | --tarball ]: Location of tarball [ -T | --tarball ]: Location of tarball
[ -d | --debug ]: Run with 'set -x' to debug errors
Options, mutually exclusive of "-C" and "--cloud": Options, mutually exclusive of "-C" and "--cloud":
[ -i | --hostid ]: HostID for cloud-init, defaults to random string [ -i | --hostid ]: HostID for cloud-init, defaults to random string
[ -u | --userdata ]: Cloud-init user-data file to configure container on start [ -u | --userdata ]: Cloud-init user-data file to configure container on start
[ -S | --auth_key ]: SSH Public key file to inject into container [ -S | --auth-key ]: SSH Public key file to inject into container
[ -L | --nolocales ]: Do not copy host's locales into container [ -L | --nolocales ]: Do not copy host's locales into container
EOF EOF
return 0 return 0
} }
options=$(getopt -o a:hp:r:n:Fi:CLS:T: -l arch:,help,path:,release:,name:,flush-cache,hostid:,auth-key:,cloud,no_locales,tarball: -- "$@") options=$(getopt -o a:hp:r:n:Fi:CLS:T:d -l arch:,help,path:,release:,name:,flush-cache,hostid:,auth-key:,cloud,no_locales,tarball:,debug -- "$@")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
usage $(basename $0) usage $(basename $0)
exit 1 exit 1
@ -150,6 +151,7 @@ else
fi fi
fi fi
debug=0
hostarch=$arch hostarch=$arch
cloud=0 cloud=0
locales=1 locales=1
@ -166,14 +168,19 @@ do
-i|--hostid) host_id=$2; shift 2;; -i|--hostid) host_id=$2; shift 2;;
-u|--userdata) userdata=$2; shift 2;; -u|--userdata) userdata=$2; shift 2;;
-C|--cloud) cloud=1; shift 1;; -C|--cloud) cloud=1; shift 1;;
-S|--auth_key) auth_key=$2; shift 2;; -S|--auth-key) auth_key=$2; shift 2;;
-L|--no_locales) locales=0; shift 2;; -L|--no_locales) locales=0; shift 2;;
-T|--tarball) tarball=$2; shift 2;; -T|--tarball) tarball=$2; shift 2;;
-d|--debug) debug=1; shift 1;;
--) shift 1; break ;; --) shift 1; break ;;
*) break ;; *) break ;;
esac esac
done done
if [ $debug -eq ]; then
set -x
fi
if [ "$arch" == "i686" ]; then if [ "$arch" == "i686" ]; then
arch=i386 arch=i386
fi fi

16
templates/lxc-ubuntu.in
View File

@ -519,18 +519,18 @@ do_bindhome()
usage() usage()
{ {
cat <<EOF cat <<EOF
$1 -h|--help [-a|--arch] [-b|--bindhome <user>] [--trim] $1 -h|--help [-a|--arch] [-b|--bindhome <user>] [--trim] [-d|--debug]
[-F | --flush-cache] [-r|--release <release>] [ -S | --auth_key <keyfile>] [-F | --flush-cache] [-r|--release <release>] [ -S | --auth-key <keyfile>]
release: lucid | maverick | natty | oneiric | precise release: lucid | maverick | natty | oneiric | precise
trim: make a minimal (faster, but not upgrade-safe) container trim: make a minimal (faster, but not upgrade-safe) container
bindhome: bind <user>'s home into the container bindhome: bind <user>'s home into the container
arch: amd64 or i386: defaults to host arch arch: amd64 or i386: defaults to host arch
auth_key: SSH Public key file to inject into container auth-key: SSH Public key file to inject into container
EOF EOF
return 0 return 0
} }
options=$(getopt -o a:b:hp:r:xn:FS: -l arch:,bindhome:,help,path:,release:,trim,name:,flush-cache,auth-key: -- "$@") options=$(getopt -o a:b:hp:r:xn:FS:d -l arch:,bindhome:,help,path:,release:,trim,name:,flush-cache,auth-key:,debug -- "$@")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
usage $(basename $0) usage $(basename $0)
exit 1 exit 1
@ -566,6 +566,7 @@ else
fi fi
fi fi
debug=0
trim_container=0 trim_container=0
hostarch=$arch hostarch=$arch
flushcache=0 flushcache=0
@ -580,12 +581,17 @@ do
-b|--bindhome) bindhome=$2; shift 2;; -b|--bindhome) bindhome=$2; shift 2;;
-a|--arch) arch=$2; shift 2;; -a|--arch) arch=$2; shift 2;;
-x|--trim) trim_container=1; shift 1;; -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;;
--) shift 1; break ;; --) shift 1; break ;;
*) break ;; *) break ;;
esac esac
done done
if [ $debug -eq 1 ]; then
set -x
fi
pwd=`getent passwd $bindhome` pwd=`getent passwd $bindhome`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error: no password entry found for $bindhome" echo "Error: no password entry found for $bindhome"