diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2017-06-01 13:23:23 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2017-06-24 14:11:54 +0000 |
| commit | cfb5c24f96f6fa9f45fab986e382d6aa6aef7a55 (patch) | |
| tree | 453f48667920d9eb98e7d6472a251d9229971b16 /lib/container | |
| parent | Adding new container top command manpage. (diff) | |
| download | compute-tools-cfb5c24f96f6fa9f45fab986e382d6aa6aef7a55.tar.xz compute-tools-cfb5c24f96f6fa9f45fab986e382d6aa6aef7a55.zip | |
Renaming cnt.auto to cnt.container-server in order to split functionality of 'binding container to a specific host system' from 'starting container at system boot'.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
| -rwxr-xr-x | lib/container/auto | 2 | ||||
| -rwxr-xr-x | lib/container/create | 12 | ||||
| -rwxr-xr-x | lib/container/list | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/container/auto b/lib/container/auto index 45aa68f..72b4290 100755 --- a/lib/container/auto +++ b/lib/container/auto @@ -104,7 +104,7 @@ esac for FILE in "${CONFIG}"/*.conf do - if grep -Eqs "^ *cnt.auto=true" "${FILE}" || grep -Eqs "^ *cnt.auto=${HOST}" "${FILE}" + if grep -Eqs "^ *cnt.container-server=true" "${FILE}" || grep -Eqs "^ *cnt.container-server=${HOST}" "${FILE}" then CONTAINER="$(basename ${FILE} .conf)" diff --git a/lib/container/create b/lib/container/create index 1a6f4d5..c9db754 100755 --- a/lib/container/create +++ b/lib/container/create @@ -27,7 +27,7 @@ SCRIPTS="/usr/share/container-tools/scripts" Parameters () { - GETOPT_LONGOPTIONS="name:,cnt.auto:,cnt.overlay:,bind:,bind-ro:,capability:,drop-capability:script:," + GETOPT_LONGOPTIONS="name:,cnt.container-server:,cnt.overlay:,bind:,bind-ro:,capability:,drop-capability:script:," GETOPT_OPTIONS="n:,b:,c:,d:,s:," PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})" @@ -48,8 +48,8 @@ Parameters () shift 2 ;; - --cnt.auto) - CNT_AUTO="${2}" + --cnt.container-server) + CNT_CONTAINER_SERVER="${2}" shift 2 ;; @@ -98,7 +98,7 @@ Parameters () Usage () { - echo "Usage: container ${COMMAND} -n|--name NAME [--cnt.auto=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro 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.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-- SCRIPT_OPTIONS]" >&2 exit 1 } @@ -145,7 +145,7 @@ else fi fi -CNT_AUTO="${CNT_AUTO:-$(hostname -f)}" +CNT_CONTAINER_SERVER="${CNT_CONTAINER_SERVER:-$(hostname -f)}" # Pre hooks for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}" @@ -204,7 +204,7 @@ fi # config mkdir -p "${CONFIG}" -sed -e "s|@CNT_AUTO@|${CNT_AUTO}|g" \ +sed -e "s|@CNT_CONTAINER_SERVER@|${CNT_CONTAINER_SERVER}|g" \ -e "s|@CNT_NETWORK_BRIDGE@|${CNT_NETWORK_BRIDGE}|g" \ -e "s|@CNT_OVERLAY@|${CNT_OVERLAY}|g" \ -e "s|@NAME@|${NAME}|g" \ diff --git a/lib/container/list b/lib/container/list index 9bf61c4..8d1ef96 100755 --- a/lib/container/list +++ b/lib/container/list @@ -329,10 +329,10 @@ do if [ -e "${CONFIG}/${CONTAINER}.conf" ] then - AUTO="$(awk -F= '/^cnt.auto=/ { print $2 }' ${CONFIG}/${CONTAINER}.conf)" - AUTO="${AUTO:-false}" + CONTAINER_SERVER="$(awk -F= '/^cnt.container-server=/ { print $2 }' ${CONFIG}/${CONTAINER}.conf)" + CONTAINER_SERVER="${CONTAINER_SERVER:-false}" - case "${AUTO}" in + case "${CONTAINER_SERVER}" in ${HOST}|true) ;; |