Adding upstream version 20180118.upstream/20180118

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

15 files changed, 40 insertions, 2 deletions

diff --git a/lib/container/auto b/lib/container/auto
index cbacad2..9bdd484 100755
--- a/lib/container/auto
+++ b/lib/container/auto
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/console b/lib/container/console
index 13bceb9..9ec3db8 100755
--- a/lib/container/console
+++ b/lib/container/console
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/create b/lib/container/create
index 570492f..6f9a240 100755
--- a/lib/container/create
+++ b/lib/container/create
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/enter b/lib/container/enter
index dc2dd09..e52a8e1 100755
--- a/lib/container/enter
+++ b/lib/container/enter
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/key b/lib/container/key
index e97d8e1..8a73ae1 100755
--- a/lib/container/key
+++ b/lib/container/key
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/limit b/lib/container/limit
index 05bffdc..71d874f 100755
--- a/lib/container/limit
+++ b/lib/container/limit
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/list b/lib/container/list
index 3e1f981..00eebd1 100755
--- a/lib/container/list
+++ b/lib/container/list
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/move b/lib/container/move
index 3cc2e40..af17b35 100755
--- a/lib/container/move
+++ b/lib/container/move
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/remove b/lib/container/remove
index c9a45a6..6310597 100755
--- a/lib/container/remove
+++ b/lib/container/remove
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/restart b/lib/container/restart
index a5c2b93..db7811e 100755
--- a/lib/container/restart
+++ b/lib/container/restart
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/start b/lib/container/start
index 566b4b0..ca88af2 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
@@ -210,7 +212,11 @@ then
 		do
 			DIRECTORY="$(echo ${BIND} | awk -F: '{ print $1 }')"
 
-			mkdir -p "${DIRECTORY}"
+			if [ ! -e "${DIRECTORY}" ]
+			then
+				echo "'${DIRECTORY}': creating non-existing directory for bind mounting"
+				mkdir -p "${DIRECTORY}"
+			fi
 		done
 
 		BIND=""
@@ -231,7 +237,11 @@ then
 		do
 			DIRECTORY="$(echo ${BIND_RO} | awk -F: '{ print $1 }')"
 
-			mkdir -p "${DIRECTORY}"
+			if [ ! -e "${DIRECTORY}" ]
+			then
+				echo "'${DIRECTORY}': creating non-existing directory for bind-ro mounting"
+				mkdir -p "${DIRECTORY}"
+			fi
 		done
 
 		BIND_RO=""
diff --git a/lib/container/status b/lib/container/status
index 7429c78..9c5ab20 100755
--- a/lib/container/status
+++ b/lib/container/status
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2016 Simon Spöehel <simon.spoehel@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/stop b/lib/container/stop
index 6b1c986..f6618d5 100755
--- a/lib/container/stop
+++ b/lib/container/stop
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/top b/lib/container/top
index 0ff1834..47725ff 100755
--- a/lib/container/top
+++ b/lib/container/top
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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
diff --git a/lib/container/version b/lib/container/version
index 89790e9..9f0afd1 100755
--- a/lib/container/version
+++ b/lib/container/version
@@ -3,6 +3,8 @@
 # container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
+# 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