diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2016-11-25 10:25:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2016-11-25 10:25:53 +0000 |
| commit | 68fb1d466b4dce1f0a8806adfe750d5948234906 (patch) | |
| tree | 0142813dd882e4be7d0955037118d9ffa0572910 /share | |
| parent | Adding upstream version 20161122. (diff) | |
| download | open-infrastructure-compute-tools-68fb1d466b4dce1f0a8806adfe750d5948234906.tar.xz open-infrastructure-compute-tools-68fb1d466b4dce1f0a8806adfe750d5948234906.zip | |
Adding upstream version 20161125.upstream/20161125
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'share')
| -rwxr-xr-x | share/scripts/curl | 6 | ||||
| -rwxr-xr-x | share/scripts/debconf | 17 | ||||
| -rwxr-xr-x | share/scripts/debootstrap | 6 |
3 files changed, 9 insertions, 20 deletions
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 |