diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2016-12-11 13:21:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2016-12-11 13:31:09 +0000 |
| commit | ef124f86b4c1af391c70007f2a2658a24e265271 (patch) | |
| tree | 92eec333ae554f76402c3a5155116c9d1fcfb95d /share/scripts | |
| parent | Releasing debian version 20161101-lts1-1. (diff) | |
| download | open-infrastructure-compute-tools-ef124f86b4c1af391c70007f2a2658a24e265271.tar.xz open-infrastructure-compute-tools-ef124f86b4c1af391c70007f2a2658a24e265271.zip | |
Merging upstream version 20161101-lts2.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
| -rwxr-xr-x | share/scripts/debconf | 13 | ||||
| -rwxr-xr-x | share/scripts/debconf.d/0003-debconf | 4 | ||||
| -rwxr-xr-x | share/scripts/debootstrap | 2 |
3 files changed, 4 insertions, 15 deletions
diff --git a/share/scripts/debconf b/share/scripts/debconf index 4878d98..69282ba 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -81,7 +81,7 @@ Parameters () Usage () { - echo "Usage: container create -n|--name NAME -s|--script ${SCRIPT} [-p|--preseed-file FILE]" >&2 + echo "Usage: container create -n|--name NAME -s|--script ${SCRIPT} -- [-p|--preseed-file FILE]" >&2 exit 1 } @@ -235,17 +235,6 @@ Debootstrap () INCLUDE="${INCLUDE},apt-transport-https,ca-certificates" fi - # FIXME: trim down, debootstrap variants? - case "${MODE}" in - debian) - INCLUDE="${INCLUDE},ifupdown,locales,libui-dialog-perl,dialog,isc-dhcp-client,netbase,net-tools,iproute,wget" - ;; - - progress-linux) - INCLUDE="${INCLUDE},apt-utils,ifupdown,locales-all,libui-dialog-perl,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/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf index c0944fa..77dc030 100755 --- a/share/scripts/debconf.d/0003-debconf +++ b/share/scripts/debconf.d/0003-debconf @@ -32,8 +32,8 @@ Distribution () then case "${MODE}" in debian) - db_subst cnt-debconf/distribution CHOICES "Debian GNU/Linux 8 \"jessie\", Debian GNU/Linux 9 \"stretch\", Debian GNU/Linux unstable/sid" - db_subst cnt-debconf/distribution CHOICES_C "jessie, stretch, sid" + db_subst cnt-debconf/distribution CHOICES "Debian GNU/Linux 9 \"stretch\", Debian GNU/Linux unstable/sid" + db_subst cnt-debconf/distribution CHOICES_C "stretch, sid" db_set cnt-debconf/distribution stretch db_fset cnt-debconf/distribution seen false diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap index 1ead471..e04f32d 100755 --- a/share/scripts/debootstrap +++ b/share/scripts/debootstrap @@ -95,7 +95,7 @@ Parameters () Usage () { - echo "Usage: container create -n|--name NAME -s|--script ${SCRIPT} [-a|--architecture ARCHITECTURE] [-d|--distribution DISTRIBUTION] [-m|--mirror MIRROR] [-p|--password PASSWORD}" >&2 + echo "Usage: container create -n|--name NAME -s|--script ${SCRIPT} -- [-a|--architecture ARCHITECTURE] [-d|--distribution DISTRIBUTION] [-m|--mirror MIRROR] [-p|--password PASSWORD}" >&2 exit 1 } |