summaryrefslogtreecommitdiffstats
path: root/share/create-scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-08-19 08:06:36 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-08-19 09:20:40 +0000
commitf7359323e5caf8f532f9ec528b7b8934c4911d92 (patch)
treee9dc6e60070486cf789159b75101fd64efe70bb0 /share/create-scripts
parentCopying build-scripts as create-scripts to refactor and unify get and build s... (diff)
downloadcompute-tools-f7359323e5caf8f532f9ec528b7b8934c4911d92.tar.xz
compute-tools-f7359323e5caf8f532f9ec528b7b8934c4911d92.zip
Avoid passing create command parameter to scripts in container create command.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'share/create-scripts')
-rwxr-xr-xshare/create-scripts/debconf29
-rwxr-xr-xshare/create-scripts/debootstrap29
2 files changed, 4 insertions, 54 deletions
diff --git a/share/create-scripts/debconf b/share/create-scripts/debconf
index 39856ae..24a3d71 100755
--- a/share/create-scripts/debconf
+++ b/share/create-scripts/debconf
@@ -33,8 +33,8 @@ MACHINES="/var/lib/machines"
Parameters ()
{
- GETOPT_LONGOPTIONS="bind:,bind-ro:,script:,name:,preseed-file:"
- GETOPT_OPTIONS="b:,s:,n:,p:"
+ GETOPT_LONGOPTIONS="name:,preseed-file:"
+ GETOPT_OPTIONS="n:,p:"
PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${SCRIPT} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
@@ -49,31 +49,6 @@ Parameters ()
while true
do
case "${1}" in
- -b|--bind)
- # ignore
- shift 2
- ;;
-
- --bind-ro)
- # ignore
- shift 2
- ;;
-
- --cnt.auto)
- # ignore
- shift 2
- ;;
-
- --cnt.container-server)
- # ignore
- shift 2
- ;;
-
- -s|--script)
- # ignore
- shift 2
- ;;
-
-n|--name)
NAME="${2}"
shift 2
diff --git a/share/create-scripts/debootstrap b/share/create-scripts/debootstrap
index 4c047ee..01345f9 100755
--- a/share/create-scripts/debootstrap
+++ b/share/create-scripts/debootstrap
@@ -30,8 +30,8 @@ MACHINES="/var/lib/machines"
Parameters ()
{
- GETOPT_LONGOPTIONS="bind:,bind-ro:,script:,name:,architecture:,distribution:,mirror:,password:"
- GETOPT_OPTIONS="b:,s:,n:,a:,d:,m:,p:"
+ GETOPT_LONGOPTIONS="name:,architecture:,distribution:,mirror:,password:"
+ GETOPT_OPTIONS="n:,a:,d:,m:,p:"
PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${SCRIPT} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
@@ -46,31 +46,6 @@ Parameters ()
while true
do
case "${1}" in
- -b|--bind)
- # ignore
- shift 2
- ;;
-
- --bind-ro)
- # ignore
- shift 2
- ;;
-
- --cnt.auto)
- # ignore
- shift 2
- ;;
-
- --cnt.container-server)
- # ignore
- shift 2
- ;;
-
- -s|--script)
- # ignore
- shift 2
- ;;
-
-n|--name)
NAME="${2}"
shift 2