Merging upstream version 20160401.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

4 files changed, 142 insertions, 1 deletions

diff --git a/bin/cntsh b/bin/cntsh
new file mode 120000
index 0000000..38c4486
--- /dev/null
+++ b/bin/cntsh
@@ -0,0 +1 @@
+container-shell
\ No newline at end of file
diff --git a/bin/container b/bin/container
index 3bfe7b5..f644e6d 100755
--- a/bin/container
+++ b/bin/container
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Open Infrastructure: container-tools
+# 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
diff --git a/bin/container-autostart b/bin/container-autostart
new file mode 100755
index 0000000..92e2383
--- /dev/null
+++ b/bin/container-autostart
@@ -0,0 +1,47 @@
+#!/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
+
+if [ ! -x /usr/bin/screen ]
+then
+	echo "'${NAME}': /usr/bin/screen - no such file." >&2
+	exit 1
+fi
+
+HOST="$(hostname -f)"
+
+HOME="${HOME:-/root}"
+SHELL="/bin/bash"
+export HOME SHELL
+
+cd "${HOME}"
+
+#screen -S container -A -d -m -t cnt bash -cl "cntsh && bash -l"
+screen -S container -A -d -m -t cnt bash -l
+
+for CONFIG in /etc/container-tools/config/*.conf
+do
+	if grep -Eqs "^ *cnt.autostart=true" "${CONFIG}" || grep -Eqs "^ *cnt.autostart=${HOST}" "${CONFIG}"
+	then
+		CONTAINER="$(basename ${CONFIG} .conf)"
+		TITLE="$(echo ${CONTAINER} | awk -F. '{ print $1 }')"
+
+		screen -S container -X screen -t ${TITLE} bash -cl "cnt start -n ${CONTAINER} && bash -l"
+	fi
+done
diff --git a/bin/container-shell b/bin/container-shell
new file mode 100755
index 0000000..f40d711
--- /dev/null
+++ b/bin/container-shell
@@ -0,0 +1,93 @@
+#!/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
+
+SOFTWARE="container-tools"
+PROGRAM="container"
+
+COMMAND="$(basename ${0})"
+
+Usage ()
+{
+	echo "Usage: ${PROGRAM}-shell" >&2
+	exit 1
+}
+
+Shell ()
+{
+	COMMAND="${1}"
+
+	if [ -z "${COMMAND}" ]
+	then
+		return
+	fi
+
+	shift 1
+
+	OPTIONS="${@}"
+
+	case "${COMMAND}" in
+		exit|logout|quit)
+			exit 0
+			;;
+
+		help)
+			case "${OPTIONS}" in
+				"")
+					echo
+					echo "The following ${PROGRAM} commands are available:"
+
+					cd "/usr/lib/${SOFTWARE}/${PROGRAM}"
+					ls
+					cd "${OLDPWD}"
+
+					return
+					;;
+
+				*)
+					man container-${1}
+
+					return
+					;;
+			esac
+			;;
+	esac
+
+	if [ ! -e "/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" ]
+	then
+		echo "'${COMMAND}': no such ${PROGRAM} command" >&2
+		return
+	else
+		"/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" "${OPTIONS}" || true
+	fi
+}
+
+trap 'echo' EXIT HUP INT QUIT TERM
+
+echo "${PROGRAM}-shell $(${PROGRAM} version)"
+echo "Type \"help\" for more information."
+
+while true
+do
+	echo
+	echo -n "${PROGRAM}: "
+	read CMDLINE
+
+	Shell ${CMDLINE}
+done