From 07357f5916ea7380a6008b6e29d50c1889311491 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 25 Oct 2016 15:13:01 +0200 Subject: Merging upstream version 20161101. Signed-off-by: Daniel Baumann --- bin/container-nsenter | 22 ---------------------- bin/container-shell | 7 ++++++- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100755 bin/container-nsenter (limited to 'bin') 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 -# -# 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 diff --git a/bin/container-shell b/bin/container-shell index fd85d93..da91c76 100755 --- a/bin/container-shell +++ b/bin/container-shell @@ -23,6 +23,8 @@ PROGRAM="container" COMMAND="$(basename ${0})" +LC_ALL="C.UTF-8" + Usage () { echo "Usage: ${PROGRAM}-shell" >&2 @@ -64,6 +66,9 @@ Shell () echo "$(for COMMAND in about logout *; do echo ${COMMAND}; done | sort)" cd "${OLDPWD}" + echo + echo "Use 'help COMMAND' for more information." + return ;; @@ -82,7 +87,7 @@ Shell () return else echo - "/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" "${OPTIONS}" || true + sudo "/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" "${OPTIONS}" || true fi } -- cgit v1.2.3