diff options
Diffstat (limited to 'lib/container/create')
| -rwxr-xr-x | lib/container/create | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/container/create b/lib/container/create index fab9f5b..0b0aa3a 100755 --- a/lib/container/create +++ b/lib/container/create @@ -25,7 +25,7 @@ MACHINES="/var/lib/machines" Parameters () { - LONG_OPTIONS="name:,cnt.autostart:,bind:,capability:,drop-capability:script:" + LONG_OPTIONS="name:,cnt.auto:,bind:,capability:,drop-capability:script:" OPTIONS="n:,b:,c:,d:,s:" PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})" @@ -46,8 +46,8 @@ Parameters () shift 2 ;; - --cnt.autostart) - CNT_AUTOSTART="${2}" + --cnt.auto) + CNT_AUTO="${2}" shift 2 ;; @@ -86,7 +86,7 @@ Parameters () Usage () { - echo "Usage: container ${COMMAND} -n|--name NAME [--cnt.autostart=true|false|FQDN] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-- SCRIPT_OPTIONS]" >&2 + echo "Usage: container ${COMMAND} -n|--name NAME [--cnt.auto=true|false|FQDN] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-- SCRIPT_OPTIONS]" >&2 exit 1 } @@ -110,7 +110,7 @@ then echo "'${SCRIPT}': no such script" >&2 fi -CNT_AUTOSTART="${CNT_AUTOSTART:-$(hostname -f)}" +CNT_AUTO="${CNT_AUTO:-$(hostname -f)}" BINDS="$(echo ${BIND} | sed -e 's|;| |g')" @@ -127,7 +127,8 @@ done # config mkdir -p "${CONFIG}" -sed -e "s|@CNT_AUTOSTART@|${CNT_AUTOSTART}|g" \ +sed -e "s|@CNT_AUTO@|${CNT_AUTO}|g" \ + -e "s|@CNT_NETWORK_BRIDGE@|${CNT_NETWORK_BRIDGE}|g" \ -e "s|@NAME@|${NAME}|g" \ -e "s|@BIND@|${BIND}|g" \ -e "s|@BOOT@|yes|g" \ @@ -135,8 +136,7 @@ sed -e "s|@CNT_AUTOSTART@|${CNT_AUTOSTART}|g" \ -e "s|@DIRECTORY@|${MACHINES}/${NAME}|g" \ -e "s|@DROP_CAPABILITY@|${DROP_CAPABILITY}|g" \ -e "s|@MACHINE@|${NAME}|g" \ - -e "s|@NETWORK_VETH@|yes|g" \ - -e "s|@NETWORK_BRIDGE@|br0|g" \ + -e "s|@NETWORK_VETH_EXTRA@|${NETWORK_VETH_EXTRA}|g" \ -e "s|@LINK_JOURNAL@|no|g" \ -e "s|@REGISTER@|yes|g" \ /usr/share/container-tools/config/container.conf.in > "${CONFIG}/${NAME}.conf" |