Adding upstream version 20161125.upstream/20161125

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

12 files changed, 36 insertions, 36 deletions

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