Adding upstream version 20161125.upstream/20161125

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

17 files changed, 54 insertions, 57 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7998bac..1f9b5d0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+2016-11-25	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20161122.
+
+	[ Daniel Baumann ]
+	* Renaming too generic internal getopt variables to avoid possible collisions in the future.
+	* Minimizing included packages by default in debconf container create script.
+
 2016-11-22	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20161122.
diff --git a/VERSION.txt b/VERSION.txt
index b4ec7ea..097e335 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20161122
+20161125
diff --git a/lib/container/auto b/lib/container/auto
index ac65595..eb23f87 100755
--- a/lib/container/auto
+++ b/lib/container/auto
@@ -24,10 +24,10 @@ CONFIG="/etc/container-tools/config"
 
 Parameters ()
 {
-	LONG_OPTIONS="start,stop,"
-	OPTIONS="s,t,"
+	GETOPT_LONGOPTIONS="start,stop,"
+	GETOPT_OPTIONS="s,t,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/console b/lib/container/console
index 84c561d..ab3dfaf 100755
--- a/lib/container/console
+++ b/lib/container/console
@@ -24,10 +24,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="name:,"
-	OPTIONS="n:,"
+	GETOPT_LONGOPTIONS="name:,"
+	GETOPT_OPTIONS="n:,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/create b/lib/container/create
index cb51871..cd3a455 100755
--- a/lib/container/create
+++ b/lib/container/create
@@ -26,10 +26,10 @@ SCRIPTS="/usr/share/container-tools/scripts"
 
 Parameters ()
 {
-	LONG_OPTIONS="name:,cnt.auto:,cnt.overlay:,bind:,capability:,drop-capability:script:,"
-	OPTIONS="n:,b:,c:,d:,s:,"
+	GETOPT_LONGOPTIONS="name:,cnt.auto:,cnt.overlay:,bind:,capability:,drop-capability:script:,"
+	GETOPT_OPTIONS="n:,b:,c:,d:,s:,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/enter b/lib/container/enter
index 4eff504..6023d92 100755
--- a/lib/container/enter
+++ b/lib/container/enter
@@ -24,10 +24,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="name:,"
-	OPTIONS="n:,"
+	GETOPT_LONGOPTIONS="name:,"
+	GETOPT_OPTIONS="n:,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/limit b/lib/container/limit
index 8b5ffd5..a9882c9 100755
--- a/lib/container/limit
+++ b/lib/container/limit
@@ -24,10 +24,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="name:,blockio-device-weight:,blockio-read-bandwith:,blockio-weight:,blockio-write-bandwith:,cpu-quota:,cpu-shares:,memory-limit:,tasks-max:,"
-	OPTIONS="n:b:c:m:t:,"
+	GETOPT_LONGOPTIONS="name:,blockio-device-weight:,blockio-read-bandwith:,blockio-weight:,blockio-write-bandwith:,cpu-quota:,cpu-shares:,memory-limit:,tasks-max:,"
+	GETOPT_OPTIONS="n:b:c:m:t:,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/list b/lib/container/list
index 04e9f0f..3c23c24 100755
--- a/lib/container/list
+++ b/lib/container/list
@@ -25,10 +25,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="all,format:,host:,other,started,stopped,"
-	OPTIONS="a,f:,h:,o,s,t,"
+	GETOPT_LONGOPTIONS="all,format:,host:,other,started,stopped,"
+	GETOPT_OPTIONS="a,f:,h:,o,s,t,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/remove b/lib/container/remove
index 04e7d30..3670ca4 100755
--- a/lib/container/remove
+++ b/lib/container/remove
@@ -25,10 +25,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="name:,force,verbose,"
-	OPTIONS="n:,f,v,"
+	GETOPT_LONGOPTIONS="name:,force,verbose,"
+	GETOPT_OPTIONS="n:,f,v,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/rename b/lib/container/rename
index 2d27615..467d687 100755
--- a/lib/container/rename
+++ b/lib/container/rename
@@ -25,10 +25,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="force,new:,old:,"
-	OPTIONS="f,n:,o:,"
+	GETOPT_LONGOPTIONS="force,new:,old:,"
+	GETOPT_OPTIONS="f,n:,o:,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/restart b/lib/container/restart
index 295e0de..468b297 100755
--- a/lib/container/restart
+++ b/lib/container/restart
@@ -24,10 +24,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="name:,"
-	OPTIONS="n:,"
+	GETOPT_LONGOPTIONS="name:,"
+	GETOPT_OPTIONS="n:,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/start b/lib/container/start
index 5191ae2..20d738e 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -28,10 +28,10 @@ SYSTEMCTL="true"
 
 Parameters ()
 {
-	LONG_OPTIONS="name:,force,nspawn,start,"
-	OPTIONS="n:f,"
+	GETOPT_LONGOPTIONS="name:,force,nspawn,start,"
+	GETOPT_OPTIONS="n:f,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/status b/lib/container/status
index b797c98..65a7210 100755
--- a/lib/container/status
+++ b/lib/container/status
@@ -25,10 +25,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="name:,"
-	OPTIONS="n:,"
+	GETOPT_LONGOPTIONS="name:,"
+	GETOPT_OPTIONS="n:,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/lib/container/stop b/lib/container/stop
index ec24d51..3327025 100755
--- a/lib/container/stop
+++ b/lib/container/stop
@@ -27,10 +27,10 @@ CLEAN="false"
 
 Parameters ()
 {
-	LONG_OPTIONS="name:,force,clean,"
-	OPTIONS="n:,f,"
+	GETOPT_LONGOPTIONS="name:,force,clean,"
+	GETOPT_OPTIONS="n:,f,"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${COMMAND} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/share/scripts/curl b/share/scripts/curl
index b67cbd4..6b7d6a0 100755
--- a/share/scripts/curl
+++ b/share/scripts/curl
@@ -25,10 +25,10 @@ CACHE="/var/cache/container-tools/images"
 
 Parameters ()
 {
-	LONG_OPTIONS="bind:,script:,name:,clean,image:,server:,password:"
-	OPTIONS="b:,s:,n:,p:"
+	GETOPT_LONGOPTIONS="bind:,script:,name:,clean,image:,server:,password:"
+	GETOPT_OPTIONS="b:,s:,n:,p:"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${SCRIPT} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${SCRIPT} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 1cb49b0..cde66cb 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -25,10 +25,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="bind:,script:,name:,preseed-file:"
-	OPTIONS="b:,s:,n:,p:"
+	GETOPT_LONGOPTIONS="bind:,script:,name:,preseed-file:"
+	GETOPT_OPTIONS="b:,s:,n:,p:"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${SCRIPT} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${SCRIPT} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then
@@ -244,17 +244,6 @@ Debootstrap ()
 		INCLUDE="${INCLUDE},apt-transport-https,ca-certificates"
 	fi
 
-	# FIXME: trim down, debootstrap variants?
-	case "${MODE}" in
-		debian)
-			INCLUDE="${INCLUDE},locales,dialog,isc-dhcp-client,netbase,net-tools,iproute,wget"
-			;;
-
-		progress-linux)
-			INCLUDE="${INCLUDE},apt-utils,locales-all,dialog,isc-dhcp-client,netbase,net-tools,iproute,openssh-server,wget"
-			;;
-	esac
-
 	mkdir -p "$(dirname ${DIRECTORY})"
 	debootstrap --verbose --arch=${ARCHITECTURE} --components=${PARENT_ARCHIVE_AREAS} --include=${INCLUDE} \
 		${PARENT_DISTRIBUTION} "${DIRECTORY}" ${PARENT_MIRROR}
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index e04f32d..9c76ba0 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -24,10 +24,10 @@ MACHINES="/var/lib/machines"
 
 Parameters ()
 {
-	LONG_OPTIONS="bind:,script:,name:,architecture:,distribution:,mirror:,password:"
-	OPTIONS="b:,s:,n:,a:,d:,m:,p:"
+	GETOPT_LONGOPTIONS="bind:,script:,name:,architecture:,distribution:,mirror:,password:"
+	GETOPT_OPTIONS="b:,s:,n:,a:,d:,m:,p:"
 
-	PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${SCRIPT} --options ${OPTIONS} --shell sh -- ${@})"
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${SCRIPT} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
 	if [ "${?}" != "0" ]
 	then