From 02cd53cbdce71a8fe6f9cbcf83d16b0391540b29 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 6 Nov 2016 09:46:58 +0100 Subject: Merging upstream version 20161105. Signed-off-by: Daniel Baumann --- bin/container-nsenter | 22 ++++++++++++++++++++++ bin/container-shell | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100755 bin/container-nsenter (limited to 'bin') diff --git a/bin/container-nsenter b/bin/container-nsenter new file mode 100755 index 0000000..7c83361 --- /dev/null +++ b/bin/container-nsenter @@ -0,0 +1,22 @@ +#!/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 da91c76..9b45f72 100755 --- a/bin/container-shell +++ b/bin/container-shell @@ -63,7 +63,7 @@ Shell () echo cd "/usr/lib/${SOFTWARE}/${PROGRAM}" - echo "$(for COMMAND in about logout *; do echo ${COMMAND}; done | sort)" + find . -type f -printf "%f\n" | sort cd "${OLDPWD}" echo -- cgit v1.2.3