diff --git a/diskimage_builder/elements/base/pre-install.d/03-baseline-tools b/diskimage_builder/elements/base/pre-install.d/03-baseline-tools index 3b5bb9a6..712b33cf 100755 --- a/diskimage_builder/elements/base/pre-install.d/03-baseline-tools +++ b/diskimage_builder/elements/base/pre-install.d/03-baseline-tools @@ -12,10 +12,6 @@ case $DISTRO_NAME in # Note: add-apt-repository would be nice for RPM platforms too - so when we # need something like it, create a wrapper in dpkg/bin and fedora/bin. apt-get -y update - if [ "${DIB_RELEASE}" = "precise" ]; then - install-packages python-software-properties - else - install-packages software-properties-common - fi + install-packages software-properties-common ;; esac diff --git a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader index a2308660..6b956f80 100755 --- a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader +++ b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader @@ -175,7 +175,7 @@ function install_grub2 { # grub-mkconfig generates a config with the device in it, # This shouldn't be needed, but old code has bugs DIB_RELEASE=${DIB_RELEASE:-} - if [ "$DIB_RELEASE" = 'precise' ] || [ "$DIB_RELEASE" = 'wheezy' ]; then + if [ "$DIB_RELEASE" = 'wheezy' ]; then sed -i "s%search --no.*%%" $GRUB_CFG sed -i "s%set root=.*%set root=(hd0,1)%" $GRUB_CFG fi diff --git a/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources b/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources index b0995365..1ae5acd7 100755 --- a/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources +++ b/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources @@ -15,17 +15,9 @@ if [ -z "$DIB_CLOUD_INIT_DATASOURCES" ] ; then fi if [ -d /etc/cloud/cloud.cfg.d ]; then - # DatasourceNone doesn't exist in Ubuntu 12.04 (Precise) - # which uses cloud-init version 0.6.3 - if [ "$(lsb_release -cs)" = 'precise' ] ; then - cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg < /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg < /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <