diff options
| -rwxr-xr-x | bin/container-nsenter | 22 | ||||
| -rwxr-xr-x | lib/container/enter | 102 | ||||
| -rw-r--r-- | share/bash-completion/container | 20 | ||||
| -rw-r--r-- | share/man/container-enter.1.txt | 72 | ||||
| -rw-r--r-- | share/man/container.1.txt | 3 |
5 files changed, 0 insertions, 219 deletions
diff --git a/bin/container-nsenter b/bin/container-nsenter deleted file mode 100755 index 7c83361..0000000 --- a/bin/container-nsenter +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -set -e - -# Run -script -c "/bin/bash -l" -q /dev/null diff --git a/lib/container/enter b/lib/container/enter deleted file mode 100755 index 4eff504..0000000 --- a/lib/container/enter +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -set -e - -COMMAND="$(basename ${0})" - -MACHINES="/var/lib/machines" - -Parameters () -{ - LONG_OPTIONS="name:," - OPTIONS="n:," - - PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})" - - if [ "${?}" != "0" ] - then - echo "'${COMMAND}': getopt exit" >&2 - exit 1 - fi - - eval set -- "${PARAMETERS}" - - while true - do - case "${1}" in - -n|--name) - NAME="${2}" - shift 2 - ;; - - --) - shift 1 - break - ;; - - *) - echo "'${COMMAND}': getopt error" >&2 - exit 1 - ;; - esac - done -} - -Usage () -{ - echo "Usage: container ${COMMAND} -n|--name NAME" >&2 - exit 1 -} - -Parameters "${@}" - -if [ -z "${NAME}" ] -then - Usage -fi - -if [ ! -e "${MACHINES}/${NAME}" ] -then - echo "'${NAME}': no such container" >&2 - exit 1 -fi - -STATE="$(machinectl show ${NAME} 2>&1 | awk -F= '/^State=/ { print $2 }')" - -case "${STATE}" in - running) - ;; - - *) - echo "'${NAME}': container is not running" >&2 - exit 1 - ;; -esac - -LEADER="$(machinectl status ${NAME} | awk '/Leader: / { print $2 }')" - -# Run -if [ -e "${MACHINES}/${NAME}/usr/bin/container-nsenter" ] -then - OPTIONS="/usr/bin/container-nsenter" -else - OPTIONS="" -fi - -nsenter --target ${LEADER} --mount --uts --ipc --net --pid --root --wd=/root ${OPTIONS} diff --git a/share/bash-completion/container b/share/bash-completion/container index f6434f8..a283d5f 100644 --- a/share/bash-completion/container +++ b/share/bash-completion/container @@ -82,26 +82,6 @@ _container() esac ;; - enter) - case "${cur}" in - -*) - opts="-n --name" - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - - *) - case "${prev}" in - -n|--name) - opts=$(container list -s -f short) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac - ;; - esac - ;; - limit) case "${cur}" in -*) diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt deleted file mode 100644 index 61c0f66..0000000 --- a/share/man/container-enter.1.txt +++ /dev/null @@ -1,72 +0,0 @@ -// container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. - -CONTAINER-CONSOLE(1) -==================== -:doctype: manpage -:man manual: Open Infrastructure -:man source: container-tools -:man version: {revnumber} - - -NAME ----- -container-enter - Enter a container namespace - - -SYNOPSIS --------- -*container enter* ['OPTIONS'] - - -DESCRIPTION ------------ -The container enter enters a container namespace. - - -OPTIONS -------- -The following container options are available: - -*-n, --name='NAME'*:: - Specify container name. - - -EXAMPLES --------- -*Enter to example.net container namespace:*:: - sudo container enter -n example.net - - -SEE ALSO --------- -container-tools(7), -container(1). - - -HOMEPAGE --------- -More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net. - - -BUGS ----- -Bugs can be reported by sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org. - - -AUTHORS -------- -container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>. diff --git a/share/man/container.1.txt b/share/man/container.1.txt index 32bd393..2182319 100644 --- a/share/man/container.1.txt +++ b/share/man/container.1.txt @@ -67,9 +67,6 @@ The following container commands are available: *console*:: Attach console to a container, see container-console(1). -*enter*:: - Enter a container namespace, see container-enter(1). - *limit*:: Limit ressources of a container, see container-limit(1). |