sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
diskimage-builder/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash

24 lines
1 KiB
Bash
Raw Normal View History

Split the debootstrap functions into an element debootstrap is not debian or ubuntu specific. We can make a debootstrap element that knows how to do all of the things, and then a debian-minimal and ubuntu-minimal image that use it. Finally, make the debian element simply be a collection of the extra things we do to make it look like a cloud-init based cloud image. Change-Id: Iaf46c8e61bf1cac9a096cbfd75d6d6a9111b701e
2015-03-22 20:11:55 +00:00
export DISTRO_NAME=debian
Fix packaging problems for Debian This patch solves three issues with Debian packaging / apt: o When building 'testing' only default apt sources is included - backports, updates and security are skipped because they do not exists. o The default release for Debian was `unstable`: this is now fixed to `stable`. o Starting a Debian Stretch VM that was build with diskimage-builder does not work, because some mandatory packages are missing. This patch fixes this problem: it adds the mandatory packages and the test case. Change-Id: If49b5b162c4da1e074e9b19324839bc59d87dc57 Signed-off-by: Andreas Florath <andreas@florath.net>
2016-07-17 17:03:55 +00:00
export DIB_RELEASE=${DIB_RELEASE:-stable}
Allow disto-specific mirror settings Most of our distros support DIB_DISTRIBUTION_MIRROR for setting the mirror to be used when building. This has a major downside where if someone would like to create a static configuration for building various distro images it cannot set DIB_DISTRIBUTION_MIRROR (think of the case where we want to run our tests). By adding support for DIB_$DISTRO_DISTRIBUTION_MIRROR this problem is resolved. Change-Id: I92964b17ec3e47cf97e3a3091f054b2a205ac768
2016-12-08 23:30:56 +00:00
if [ -n "${DIB_DEBIAN_DISTRIBUTION_MIRROR:-}" ]; then
DIB_DISTRIBUTION_MIRROR=$DIB_DEBIAN_DISTRIBUTION_MIRROR
fi
Default to http://ftp.us.debian.org/debian for debian-minimal Since http://httpredir.debian.org is unreliable is selecting a mirror to use, we'll now default to http://ftp.us.debian.org/debian. In fact, in openstack-infra we have been overriding httpredir.debian.org for a while, now make this default in diskimage-builder. Change-Id: I48658bc076e13a0913821197e4120c73618fef8f Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2016-09-27 21:25:37 +00:00
export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://ftp.us.debian.org/debian}
Allow disto-specific mirror settings Most of our distros support DIB_DISTRIBUTION_MIRROR for setting the mirror to be used when building. This has a major downside where if someone would like to create a static configuration for building various distro images it cannot set DIB_DISTRIBUTION_MIRROR (think of the case where we want to run our tests). By adding support for DIB_$DISTRO_DISTRIBUTION_MIRROR this problem is resolved. Change-Id: I92964b17ec3e47cf97e3a3091f054b2a205ac768
2016-12-08 23:30:56 +00:00
Fix apt-sources configuration for debian-minimal The apt-sources element did not work with debian-minimal, because the later one overwrote the /etc/apt/sources.list file created by the apt-sources element. Two changes were made: o the debian-minimal uses now files inside the /etc/apt/sources.list.d directory. Therefore there is no possibilty for clashes between those two elements any more. o instead of only adding backports, also the updates and the security repository is added by default which gives perfect initial configuration for a stable system. If you want to use local mirrors with other naming schemas or an unstable tree, there is the possibility to fully specify the repositories. Change-Id: I69dbaa34be3db3d667e6bd8450ef4ce04a751c70 Signed-off-by: Andreas Florath <andreas@florath.net>
2016-05-11 20:00:12 +00:00
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main}
export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }
DIB_APT_SOURCES_CONF_DEFAULT=\
"default:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE} ${DIB_DEBIAN_COMPONENTS_WS}
backports:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}-backports ${DIB_DEBIAN_COMPONENTS_WS}
updates:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}-updates ${DIB_DEBIAN_COMPONENTS_WS}
security:deb http://security.debian.org/ ${DIB_RELEASE}/updates ${DIB_DEBIAN_COMPONENTS_WS}
"
Fix packaging problems for Debian This patch solves three issues with Debian packaging / apt: o When building 'testing' only default apt sources is included - backports, updates and security are skipped because they do not exists. o The default release for Debian was `unstable`: this is now fixed to `stable`. o Starting a Debian Stretch VM that was build with diskimage-builder does not work, because some mandatory packages are missing. This patch fixes this problem: it adds the mandatory packages and the test case. Change-Id: If49b5b162c4da1e074e9b19324839bc59d87dc57 Signed-off-by: Andreas Florath <andreas@florath.net>
2016-07-17 17:03:55 +00:00
if [ "${DIB_RELEASE}" = "testing" -o "${DIB_RELEASE}" = "unstable" ]; then
Fix apt-sources configuration for debian-minimal The apt-sources element did not work with debian-minimal, because the later one overwrote the /etc/apt/sources.list file created by the apt-sources element. Two changes were made: o the debian-minimal uses now files inside the /etc/apt/sources.list.d directory. Therefore there is no possibilty for clashes between those two elements any more. o instead of only adding backports, also the updates and the security repository is added by default which gives perfect initial configuration for a stable system. If you want to use local mirrors with other naming schemas or an unstable tree, there is the possibility to fully specify the repositories. Change-Id: I69dbaa34be3db3d667e6bd8450ef4ce04a751c70 Signed-off-by: Andreas Florath <andreas@florath.net>
2016-05-11 20:00:12 +00:00
DIB_APT_SOURCES_CONF_DEFAULT="default:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE} ${DIB_DEBIAN_COMPONENTS_WS}"
fi
export DIB_APT_SOURCES_CONF=${DIB_APT_SOURCES_CONF:-${DIB_APT_SOURCES_CONF_DEFAULT}}
Reference in a new issue Copy permalink