From ec02cf56078c58021d5fe33a738eb00cb0079f74 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 27 May 2018 20:57:12 +0200 Subject: Merging upstream version 20180527. Signed-off-by: Daniel Baumann --- bin/container | 3 ++- bin/container-nsenter | 24 ------------------------ 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100755 bin/container-nsenter (limited to 'bin') diff --git a/bin/container b/bin/container index 9634d05..849bbec 100755 --- a/bin/container +++ b/bin/container @@ -31,6 +31,7 @@ PARAMETER="${1}" if [ -z "${PARAMETER}" ] then echo "Usage: ${PROGRAM} COMMAND [OPTIONS]" >&2 + echo "Usage: ${PROGRAM} COMMAND1,COMMAND2,... [COMMON_OPTIONS]" >&2 exit 1 fi @@ -90,7 +91,7 @@ do fi # Run - exec "/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" "${OPTIONS}" + "/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" "${OPTIONS}" # Post hooks for FILE in "${HOOKS}/post-${PROGRAM}".* "${HOOKS}/${NAME}.post-${PROGRAM}" diff --git a/bin/container-nsenter b/bin/container-nsenter deleted file mode 100755 index a12bb0d..0000000 --- a/bin/container-nsenter +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2018 Daniel Baumann -# -# SPDX-License-Identifier: GPL-3.0+ -# -# 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 . - -set -e - -# Run -script -c "/bin/bash -l" -q /dev/null -- cgit v1.2.3