Hello community,
here is the log from the commit of package diskimage-builder for
openSUSE:Factory checked in at 2019-08-22 15:04:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/diskimage-builder (Old)
and /work/SRC/openSUSE:Factory/.diskimage-builder.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diskimage-builder"
Thu Aug 22 15:04:59 2019 rev:26 rq:725237 version:2.26.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/diskimage-builder/diskimage-builder.changes
2019-07-22 12:19:38.271676215 +0200
+++
/work/SRC/openSUSE:Factory/.diskimage-builder.new.7948/diskimage-builder.changes
2019-08-22 15:07:28.678515215 +0200
@@ -1,0 +2,21 @@
+Thu Aug 22 06:31:15 UTC 2019 - Markos Chandras <[email protected]>
+
+- Update to 2.26.1
+ * zypper-minimal: Don't get confused by etc/resolv.conf symlink
+ * simple-init: add configurable RA timeout with network-manager
+ * update gentoo systemd profile to 17.1 from 17.0
+ * block-device-efi : expand disk size calculation
+ * Don't show all elements found
+ * dracut-regenerate: catch failures and exit code
+ * Fixes packages for arm64 bootloader
+ * Fixes DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE matching when empty
+ * Fix the pypi element for multiple mirror URLs
+ * Stop regex warning
+ * Create /etc/machine-id for RHEL images
+ * fix comments / spelling errors in gentoo element
+ * support alternate portage directories
+ * journal-to-console: element to send systemd journal to console
+ * update version of open-iscsi that is installed on musl
+ * Cleanup: remove useless statement
+
+-------------------------------------------------------------------
Old:
----
diskimage-builder-2.25.0.tar.gz
New:
----
diskimage-builder-2.26.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ diskimage-builder.spec ++++++
--- /var/tmp/diff_new_pack.2VRHAc/_old 2019-08-22 15:07:29.090515065 +0200
+++ /var/tmp/diff_new_pack.2VRHAc/_new 2019-08-22 15:07:29.094515062 +0200
@@ -20,7 +20,7 @@
# are only ever run inside the disk image build chroot).
%global __requires_exclude_from
^%{python3_sitelib}/diskimage_builder/elements/.*$
Name: diskimage-builder
-Version: 2.25.0
+Version: 2.26.1
Release: 0
Summary: Image Building Tools for OpenStack
License: Apache-2.0
++++++ diskimage-builder-2.25.0.tar.gz -> diskimage-builder-2.26.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.25.0/.zuul.d/jobs.yaml
new/diskimage-builder-2.26.1/.zuul.d/jobs.yaml
--- old/diskimage-builder-2.25.0/.zuul.d/jobs.yaml 2019-07-15
05:11:00.000000000 +0200
+++ new/diskimage-builder-2.26.1/.zuul.d/jobs.yaml 2019-08-21
23:48:02.000000000 +0200
@@ -199,11 +199,22 @@
vars:
dib_python: python2
+# Build and boot functional tests
+
+- job:
+ name: dib-nodepool-functional-src-base
+ description: |
+ Base job for DIB functional tests, which build and boot a node under
+ nodepool
+ parent: nodepool-functional-openstack-src-base
+ vars:
+ nodepool_debug: true
+
- job:
name: dib-nodepool-functional-openstack-centos-7-src
description: |
Test building and booting a Centos 7 image with Nodepool and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
vars:
nodepool_extra_packages:
- rpm
@@ -219,7 +230,7 @@
name: dib-nodepool-functional-openstack-fedora-29-src
description: |
Test building and booting a Fedora 29 image with Nodepool and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
vars:
nodepool_extra_packages:
- rpm
@@ -235,7 +246,7 @@
description: |
Test building and booting an Ubuntu trusty image with Nodepool
and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml
nodeset: ubuntu-xenial # Backported debootstrap only available for xenial
vars:
@@ -251,7 +262,7 @@
description: |
Test building and booting an Ubuntu xenial image with Nodepool
and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml
nodeset: ubuntu-xenial # Backported debootstrap only available for xenial
vars:
@@ -263,11 +274,28 @@
mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu"
- job:
+ name: dib-nodepool-functional-openstack-ubuntu-bionic
+ description: |
+ Test building and booting an Ubuntu bionic image with Nodepool
+ and OpenStack (using released libraries)
+ parent: nodepool-functional-openstack-base
+ pre-run: playbooks/dib-nodepool/debootstrap.yaml
+ nodeset: ubuntu-xenial # Backported debootstrap only available for xenial
+ vars:
+ nodepool_debug: true
+ nodepool_extra_packages:
+ - debootstrap
+ nodepool_diskimage:
+ base_element: ubuntu-minimal
+ release: 'bionic'
+ mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu"
+
+- job:
name: dib-nodepool-functional-openstack-ubuntu-bionic-src
description: |
Test building and booting an Ubuntu bionic image with Nodepool
and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml
nodeset: ubuntu-xenial # Backported debootstrap only available for xenial
vars:
@@ -282,7 +310,7 @@
name: dib-nodepool-functional-openstack-gentoo-src
description: |
Test building and booting a Gentoo image with Nodepool and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
vars:
nodepool_diskimage:
base_element: gentoo
@@ -295,7 +323,7 @@
description: |
Test building and booting a Debian stretch image with Nodepool
and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml
nodeset: ubuntu-xenial # Backported debootstrap only available for xenial
vars:
@@ -311,7 +339,7 @@
description: |
Test building and booting a Debian buster image with Nodepool
and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml
nodeset: ubuntu-xenial # Backported debootstrap only available for xenial
vars:
@@ -327,7 +355,7 @@
description: |
Test building and booting an openSUSE 15.0 image with Nodepool
and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
nodeset: ubuntu-xenial # Bionic lacks zypper
vars:
nodepool_extra_packages:
@@ -343,7 +371,7 @@
description: |
Test building and booting an openSUSE 15.1 image with Nodepool
and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
nodeset: ubuntu-xenial # Bionic lacks zypper
vars:
nodepool_extra_packages:
@@ -359,7 +387,7 @@
description: |
Test building and booting an openSUSE tumbleweed image with
Nodepool and OpenStack
- parent: nodepool-functional-openstack-src-base
+ parent: dib-nodepool-functional-src-base
nodeset: ubuntu-xenial # Bionic lacks zypper
vars:
nodepool_extra_packages:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.25.0/.zuul.d/project.yaml
new/diskimage-builder-2.26.1/.zuul.d/project.yaml
--- old/diskimage-builder-2.25.0/.zuul.d/project.yaml 2019-07-15
05:11:00.000000000 +0200
+++ new/diskimage-builder-2.26.1/.zuul.d/project.yaml 2019-08-21
23:48:02.000000000 +0200
@@ -16,6 +16,7 @@
- dib-nodepool-functional-openstack-opensuse-151-src
- dib-nodepool-functional-openstack-ubuntu-trusty-src
- dib-nodepool-functional-openstack-ubuntu-xenial-src
+ - dib-nodepool-functional-openstack-ubuntu-bionic
- dib-nodepool-functional-openstack-ubuntu-bionic-src
- dib-functests-centos7-python2
- dib-functests-centos7-python2-image
@@ -40,6 +41,7 @@
- dib-nodepool-functional-openstack-opensuse-151-src
- dib-nodepool-functional-openstack-ubuntu-trusty-src
- dib-nodepool-functional-openstack-ubuntu-xenial-src
+ - dib-nodepool-functional-openstack-ubuntu-bionic
- dib-nodepool-functional-openstack-ubuntu-bionic-src
- dib-functests-trusty-python2
- dib-functests-xenial-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.25.0/AUTHORS
new/diskimage-builder-2.26.1/AUTHORS
--- old/diskimage-builder-2.25.0/AUTHORS 2019-07-15 05:11:51.000000000
+0200
+++ new/diskimage-builder-2.26.1/AUTHORS 2019-08-21 23:49:26.000000000
+0200
@@ -141,6 +141,7 @@
Luigi Toscano <[email protected]>
Luong Anh Tuan <[email protected]>
Maksim Malchuk <[email protected]>
+Manuel Torrinha <[email protected]>
Mark Goddard <[email protected]>
Mark Hamzy <[email protected]>
Mark McLoughlin <[email protected]>
@@ -275,6 +276,7 @@
justin-hopper <[email protected]>
kaiokassiano <[email protected]>
lifeless <[email protected]>
+liyingjun <[email protected]>
liyuanzhen <[email protected]>
loki <[email protected]>
melissaml <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.25.0/ChangeLog
new/diskimage-builder-2.26.1/ChangeLog
--- old/diskimage-builder-2.25.0/ChangeLog 2019-07-15 05:11:51.000000000
+0200
+++ new/diskimage-builder-2.26.1/ChangeLog 2019-08-21 23:49:26.000000000
+0200
@@ -1,6 +1,31 @@
CHANGES
=======
+2.26.1
+------
+
+* zypper-minimal: Don't get confused by etc/resolv.conf symlink
+
+2.26.0
+------
+
+* simple-init: add configurable RA timeout with network-manager
+* update gentoo systemd profile to 17.1 from 17.0
+* block-device-efi : expand disk size calculation
+* Don't show all elements found
+* dracut-regenerate: catch failures and exit code
+* Fixes packages for arm64 bootloader
+* Fixes DIB\_DISTRIBUTION\_MIRROR\_UBUNTU\_IGNORE matching when empty
+* Fix the pypi element for multiple mirror URLs
+* Stop regex warning
+* Create /etc/machine-id for RHEL images
+* fix comments / spelling errors in gentoo element
+* support alternate portage directories
+* journal-to-console: element to send systemd journal to console
+* Enable nodepool debugging for functional tests
+* update version of open-iscsi that is installed on musl
+* Add a nodepool job based on releases
+
2.25.0
------
@@ -12,6 +37,7 @@
* Mailing lists change openstack-dev to openstack-discuss
* install gnupg2 by default in debian-minimal
* set default sources conf for buster as it now has a release
+* Cleanup: remove useless statement
* Enable nodepool testing for opensuse 15.1
* Replace nodepool func jobs
* Move existing Zuul project config to projects.yaml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.25.0/PKG-INFO
new/diskimage-builder-2.26.1/PKG-INFO
--- old/diskimage-builder-2.25.0/PKG-INFO 2019-07-15 05:11:51.000000000
+0200
+++ new/diskimage-builder-2.26.1/PKG-INFO 2019-08-21 23:49:27.000000000
+0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: diskimage-builder
-Version: 2.25.0
+Version: 2.26.1
Summary: Golden Disk Image builder.
Home-page: https://docs.openstack.org/diskimage-builder/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/element_dependencies.py
new/diskimage-builder-2.26.1/diskimage_builder/element_dependencies.py
--- old/diskimage-builder-2.25.0/diskimage_builder/element_dependencies.py
2019-07-15 05:11:00.000000000 +0200
+++ new/diskimage-builder-2.26.1/diskimage_builder/element_dependencies.py
2019-08-21 23:48:02.000000000 +0200
@@ -103,7 +103,8 @@
self.depends = self._get_element_set(
os.path.join(path, 'element-deps'))
- logger.debug("New element : %s", str(self))
+ # Uncomment to see all elements and deps listed as they're found
+ # logger.debug("New element : %s", str(self))
def __eq__(self, other):
return self.name == other.name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/bootloader/pkg-map
new/diskimage-builder-2.26.1/diskimage_builder/elements/bootloader/pkg-map
--- old/diskimage-builder-2.25.0/diskimage_builder/elements/bootloader/pkg-map
2019-07-15 05:11:00.000000000 +0200
+++ new/diskimage-builder-2.26.1/diskimage_builder/elements/bootloader/pkg-map
2019-08-21 23:48:02.000000000 +0200
@@ -29,8 +29,8 @@
"extlinux": "syslinux-extlinux",
"grub-pc": "grub2-tools grub2",
"grub-efi-amd64": "grub2-tools grub2-efi grub2-efi-modules",
- "grub-efi-arm64": "grub2-tools grub2-efi grub2-efi-modules",
- "grub-efi-aarch64": "grub2-tools grub2-efi grub2-efi-modules",
+ "grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules",
+ "grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules",
"grub-efi": "grub2-tools grub2-efi",
"grub-ppc64": "grub2-tools grub2"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/centos7/root.d/10-centos7-cloud-image
new/diskimage-builder-2.26.1/diskimage_builder/elements/centos7/root.d/10-centos7-cloud-image
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/centos7/root.d/10-centos7-cloud-image
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/centos7/root.d/10-centos7-cloud-image
2019-08-21 23:48:02.000000000 +0200
@@ -33,7 +33,6 @@
BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
else
DIB_RELEASE=${DIB_RELEASE:-GenericCloud}
- DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES}
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-CentOS-7-${ARCH}-$DIB_RELEASE.qcow2.xz}
BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/dracut-regenerate/finalise.d/50-dracut-regenerate
new/diskimage-builder-2.26.1/diskimage_builder/elements/dracut-regenerate/finalise.d/50-dracut-regenerate
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/dracut-regenerate/finalise.d/50-dracut-regenerate
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/dracut-regenerate/finalise.d/50-dracut-regenerate
2019-08-21 23:48:02.000000000 +0200
@@ -14,22 +14,34 @@
# License for the specific language governing permissions and limitations
# under the License.
+import logging
import os
import re
import subprocess
import yaml
+logging.basicConfig(
+ level=logging.DEBUG if int(os.getenv('DIB_DEBUG_TRACE', 0)) > 0
+ else logging.INFO)
+
+
def main():
+ logging.info("Starting dracut regeneration")
+ logging.debug("Debug logging enabled")
+
dracut_env = os.getenv('DIB_DRACUT_ENABLED_MODULES')
dracut_objects = yaml.safe_load(dracut_env)
+ logging.debug(dracut_objects)
+
modules_to_boot = []
for dracut_object in dracut_objects:
# first, install dependent packages
packages = dracut_object.get('packages', [])
for package in packages:
cmdline = ["install-packages", package]
+ logging.debug("Calling: %s" % cmdline)
subp = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
out = subp.communicate()[0]
if subp.returncode:
@@ -43,9 +55,9 @@
# regenerate dracut with the list of installed modules
if len(modules_to_boot) > 0:
cmdline = ["select-boot-kernel-initrd"]
+ logging.debug("Calling: %s" % cmdline)
subp = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
out, err = subp.communicate()
-
if subp.returncode:
e = subprocess.CalledProcessError(subp.returncode, cmdline)
e.output = out
@@ -57,11 +69,22 @@
ramdisk_path = "/boot/%s" % kernel_set[1].strip()
modules_to_boot = ' ' .join(modules_to_boot)
- subp = subprocess.Popen(['dracut', '--force', '--add', modules_to_boot,
- '-f', ramdisk_path, kernel_version],
- stdout=subprocess.PIPE)
- subp.wait()
+ cmdline = ['dracut', '--force', '--add', modules_to_boot,
+ '-f', ramdisk_path, kernel_version]
+ logging.debug("Calling: %s" % cmdline)
+ subp = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
+ out, err = subp.communicate()
+ if subp.returncode:
+ e = subprocess.CalledProcessError(subp.returncode, cmdline)
+ e.output = out
+ raise e
+
+ logging.info("dracut regenerate done")
if __name__ == '__main__':
main()
+
+# Local Variables:
+# mode: python
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/README.rst
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/README.rst
--- old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/README.rst
2019-07-15 05:11:00.000000000 +0200
+++ new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/README.rst
2019-08-21 23:48:02.000000000 +0200
@@ -26,11 +26,11 @@
* Other profiles can be used by exporting GENTOO_PROFILE with a valid profile.
A list of valid profiles follows:
- default/linux/amd64/17.0
- default/linux/amd64/17.0/no-multilib
- default/linux/amd64/17.0/hardened
- default/linux/amd64/17.0/no-multilib/hardened
- default/linux/amd64/17.0/systemd
+ default/linux/amd64/17.1
+ default/linux/amd64/17.1/no-multilib
+ default/linux/amd64/17.1/hardened
+ default/linux/amd64/17.1/no-multilib/hardened
+ default/linux/amd64/17.1/systemd
* You can set the `GENTOO_PORTAGE_CLEANUP` environment variable to False to
disable the clean up of portage repositories (including overlays). This
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/bin/install-packages
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/bin/install-packages
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/bin/install-packages
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/bin/install-packages
2019-08-21 23:48:02.000000000 +0200
@@ -20,6 +20,24 @@
set -eu
set -o pipefail
+# env is not sourced with user specified package inclusions
+# set the default bash array if GENTOO_EMERGE_ENV is not defined as an array
+if ! declare -p GENTOO_EMERGE_ENV 2> /dev/null | grep -q '^declare \-a'; then
+ declare -a GENTOO_EMERGE_ENV
+ GENTOO_EMERGE_ENV+=("USE=\"-build\"")
+ GENTOO_EMERGE_ENV+=("FEATURES=\"binpkg-multi-instance buildpkg
parallel-fetch parallel-install\"")
+ GENTOO_EMERGE_ENV+=("PKGDIR=\"/tmp/portage-pkgdir\"")
+ GENTOO_EMERGE_ENV+=("DISTDIR=\"/tmp/portage-distdir\"")
+ GENTOO_EMERGE_ENV+=("PORTDIR=\"/tmp/portage-portdir\"")
+ export GENTOO_EMERGE_ENV
+fi
+# iterate over the array, exporting each 'line'
+for (( i=0; i<${#GENTOO_EMERGE_ENV[@]}; i++ )); do
+ eval export "${GENTOO_EMERGE_ENV[i]}"
+done
+# set default opts
+GENTOO_EMERGE_DEFAULT_OPTS=${GENTOO_EMERGE_DEFAULT_OPTS:-"--binpkg-respect-use
--rebuilt-binaries=y --usepkg=y --with-bdeps=y --binpkg-changed-deps=y --quiet
--jobs=2 --autounmask=n"}
+
ACTION='install'
SCRIPTNAME="$(basename $0)"
@@ -55,7 +73,7 @@
while true; do
case "${1}" in
-u )
- if [[ ! -f /usr/portage/profiles ]]; then
+ if [[ ! -f ${PORTDIR}/profiles ]]; then
emerge-webrsync -q
fi
install_gentoo_packages --update --deep --newuse
--complete-graph=y @world
@@ -100,12 +118,12 @@
echo "Not running install-packages ${ACTION} with empty packages list"
else
if [[ "${ACTION}" == 'install' ]]; then
- if [[ ! -f /usr/portage/profiles ]]; then
+ if [[ ! -f ${PORTDIR}/profiles ]]; then
emerge-webrsync -q
fi
install_gentoo_packages -q --jobs=2 --changed-use "${PKGS}"
elif [[ "${ACTION}" == 'remove' ]]; then
- if [[ ! -f /usr/portage/profiles ]]; then
+ if [[ ! -f ${PORTDIR}/profiles ]]; then
emerge-webrsync -q
fi
install_gentoo_packages -C "${PKGS}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/cleanup.d/05-unmount
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/cleanup.d/05-unmount
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/cleanup.d/05-unmount
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/cleanup.d/05-unmount
2019-08-21 23:48:02.000000000 +0200
@@ -8,15 +8,15 @@
[[ -n "${TMP_MOUNT_PATH}" ]]
-sudo umount -f "${TMP_MOUNT_PATH}"/usr/portage/distfiles
-sudo umount -f "${TMP_MOUNT_PATH}"/usr/portage/packages
-sudo umount -f "${TMP_MOUNT_PATH}"/usr/portage
+sudo umount -f "${TMP_MOUNT_PATH}${DISTDIR}"
+sudo umount -f "${TMP_MOUNT_PATH}${PKGDIR}"
+sudo umount -f "${TMP_MOUNT_PATH}${PORTDIR}"
sudo rm -Rf "${TMP_MOUNT_PATH}"/root/.ccache/* "${TMP_MOUNT_PATH}"/usr/src/*
"${TMP_MOUNT_PATH}"/var/cache/edb/dep/*
"${TMP_MOUNT_PATH}"/var/cache/genkernel/* "${TMP_MOUNT_PATH}"/var/empty/*
"${TMP_MOUNT_PATH}"/var/state/* "${TMP_MOUNT_PATH}"/var/tmp/*
sudo rm -Rf "${TMP_MOUNT_PATH}"/etc/*- "${TMP_MOUNT_PATH}"/etc/*.old
"${TMP_MOUNT_PATH}"/etc/ssh/ssh_host_* "${TMP_MOUNT_PATH}"/root/.*history
"${TMP_MOUNT_PATH}"/root/.lesshst "${TMP_MOUNT_PATH}"/root/.ssh/known_hosts
"${TMP_MOUNT_PATH}"/root/.viminfo "${TMP_MOUNT_PATH}"/usr/share/genkernel
"${TMP_MOUNT_PATH}"/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz
if [[ "${GENTOO_PORTAGE_CLEANUP}" != "False" ]]; then
# remove portage files
- sudo rm -Rf "${TMP_MOUNT_PATH}"/usr/portage/*
"${TMP_MOUNT_PATH}"/usr/portage/.git
"${TMP_MOUNT_PATH}"/var/cache/portage/distfiles
+ sudo rm -Rf "${TMP_MOUNT_PATH}${PORTDIR}"/*
"${TMP_MOUNT_PATH}${PORTDIR}"/.git
"${TMP_MOUNT_PATH}"/var/cache/portage/distfiles
"${TMP_MOUNT_PATH}"/usr/portage/*
fi
# shrink a bit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash
2019-07-15 05:11:03.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash
2019-08-21 23:48:02.000000000 +0200
@@ -1,15 +1,21 @@
export DIB_RELEASE=gentoo
export DISTRO_NAME=gentoo
-export GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/17.0'}
+export GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/17.1'}
export GENTOO_PORTAGE_CLEANUP=${GENTOO_PORTAGE_CLEANUP:-'True'}
export GENTOO_PYTHON_TARGETS=${GENTOO_PYTHON_TARGETS:-'python2_7 python3_6'}
export
GENTOO_PYTHON_ACTIVE_VERSION=${GENTOO_PYTHON_ACTIVE_VERSION:-'python3.6'}
export GENTOO_OVERLAYS=${GENTOO_OVERLAYS:-''}
-export
GENTOO_EMERGE_DEFAULT_OPTS=${GENTOO_EMERGE_DEFAULT_OPTS:-"--binpkg-respect-use
--rebuilt-binaries=y --usepkg=y --with-bdeps=y --binpkg-changed-deps=y --quiet
--jobs=2"}
+export
GENTOO_EMERGE_DEFAULT_OPTS=${GENTOO_EMERGE_DEFAULT_OPTS:-"--binpkg-respect-use
--rebuilt-binaries=y --usepkg=y --with-bdeps=y --binpkg-changed-deps=y --quiet
--jobs=2 --autounmask=n"}
# set the default bash array if GENTOO_EMERGE_ENV is not defined as an array
if ! declare -p GENTOO_EMERGE_ENV 2> /dev/null | grep -q '^declare \-a'; then
- export GENTOO_EMERGE_ENV=('USE="-build"' 'FEATURES="binpkg-multi-instance
buildpkg parallel-fetch parallel-install"'
'EMERGE_DEFAULT_OPTS="--autounmask=n"')
+ declare -a GENTOO_EMERGE_ENV
+ GENTOO_EMERGE_ENV+=("USE=\"-build\"")
+ GENTOO_EMERGE_ENV+=("FEATURES=\"binpkg-multi-instance buildpkg
parallel-fetch parallel-install\"")
+ GENTOO_EMERGE_ENV+=("PKGDIR=\"/tmp/portage-pkgdir\"")
+ GENTOO_EMERGE_ENV+=("DISTDIR=\"/tmp/portage-distdir\"")
+ GENTOO_EMERGE_ENV+=("PORTDIR=\"/tmp/portage-portdir\"")
+ export GENTOO_EMERGE_ENV
fi
# itterate over the array, exporting each 'line'
for (( i=0; i<${#GENTOO_EMERGE_ENV[@]}; i++ )); do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/finalise.d/99-cleanup
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/finalise.d/99-cleanup
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/finalise.d/99-cleanup
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/finalise.d/99-cleanup
2019-08-21 23:48:02.000000000 +0200
@@ -15,7 +15,7 @@
fi
# sync if needed
-[[ ! -e /usr/portage/profiles ]] && emerge-webrsync
+[[ ! -e ${PORTDIR}/profiles ]] && emerge-webrsync
# make world consistent
emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --complete-graph=y --update --newuse
--deep @world
@@ -47,3 +47,6 @@
# remove within the chroot since /var/run is a symlink
rm -Rf /var/run/* /run/*
+
+# after updating, set profile to where PORTDIR actually is (varies by profile)
+ln -sf ../.."$(env -u PORTDIR portageq get_repo_path /
gentoo)/profiles/${GENTOO_PROFILE}" /etc/portage/make.profile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/pre-finalise.d/01-gentoo-cache
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/pre-finalise.d/01-gentoo-cache
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/pre-finalise.d/01-gentoo-cache
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/pre-finalise.d/01-gentoo-cache
2019-08-21 23:48:02.000000000 +0200
@@ -10,8 +10,9 @@
GENTOO_PORTAGE_PACKAGE_DIR="${DIB_IMAGE_CACHE}/gentoo/packages/${GENTOO_PROFILE}"
GENTOO_PORTAGE_DIR="${DIB_IMAGE_CACHE}/gentoo/portage"
-sudo mount --bind "${GENTOO_PORTAGE_DIR}" "${TMP_MOUNT_PATH}"/usr/portage
-mkdir -p "${TMP_MOUNT_PATH}"/usr/portage/distfiles
-sudo mount --bind "${GENTOO_PORTAGE_DISTFILES_DIR}"
"${TMP_MOUNT_PATH}"/usr/portage/distfiles
-mkdir -p "${TMP_MOUNT_PATH}"/usr/portage/packages
-sudo mount --bind "${GENTOO_PORTAGE_PACKAGE_DIR}"
"${TMP_MOUNT_PATH}"/usr/portage/packages
+mkdir -p "${TMP_MOUNT_PATH}${PORTDIR}"
+sudo mount --bind "${GENTOO_PORTAGE_DIR}" "${TMP_MOUNT_PATH}${PORTDIR}"
+mkdir -p "${TMP_MOUNT_PATH}${DISTDIR}"
+sudo mount --bind "${GENTOO_PORTAGE_DISTFILES_DIR}"
"${TMP_MOUNT_PATH}${DISTDIR}"
+mkdir -p "${TMP_MOUNT_PATH}${PKGDIR}"
+sudo mount --bind "${GENTOO_PORTAGE_PACKAGE_DIR}" "${TMP_MOUNT_PATH}${PKGDIR}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-00-set-profile
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-00-set-profile
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-00-set-profile
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-00-set-profile
2019-08-21 23:48:02.000000000 +0200
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+ set -x
+fi
+set -eu
+set -o pipefail
+
+# set profile symlink to the hardcoded PORDIR
+ln -sf ../.."${PORTDIR}/profiles/${GENTOO_PROFILE}" /etc/portage/make.profile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays
2019-08-21 23:48:02.000000000 +0200
@@ -15,14 +15,13 @@
fix_shm
fi
- if [[ ! -f /usr/portage/profiles ]]; then
+ if [[ ! -f ${PORTDIR}/profiles ]]; then
emerge-webrsync -q
fi
# upstream has problems with supporting other libcs still
if [[ "${GENTOO_PROFILE}" == *"musl"* ]]; then
- echo '>=sys-block/open-iscsi-2.0.875' >>
/etc/portage/package.mask/open-iscsi
- echo '=sys-block/open-iscsi-2.0.874-r2' >>
/etc/portage/package.keywords/open-iscsi
+ echo '=sys-block/open-iscsi-2.0.877' >>
/etc/portage/package.keywords/open-iscsi
fi
emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --oneshot openssl openssh
# install layman
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-04-install-desired-python
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-04-install-desired-python
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-04-install-desired-python
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-04-install-desired-python
2019-08-21 23:48:02.000000000 +0200
@@ -14,9 +14,7 @@
fix_shm
fi
-if [[ ! -f /usr/portage/profiles ]]; then
- emerge-webrsync -q
-fi
+[[ ! -f ${PORTDIR}/profiles ]] && emerge-webrsync -q
echo "PYTHON_TARGETS=\"${GENTOO_PYTHON_TARGETS}\"" >> /etc/portage/make.conf
[[ "${GENTOO_PYTHON_TARGETS}" == *"python3_6"* ]] && [[ ! -e
/usr/lib64/libpython3.6m.so ]] && emerge ${GENTOO_EMERGE_DEFAULT_OPTS}
--oneshot dev-lang/python:3.6
@@ -24,12 +22,11 @@
[[ "${GENTOO_PYTHON_TARGETS}" == *"python3_4"* ]] && [[ ! -e
/usr/lib64/libpython3.4m.so ]] && emerge ${GENTOO_EMERGE_DEFAULT_OPTS}
--oneshot dev-lang/python:3.4
[[ "${GENTOO_PYTHON_TARGETS}" == *"python2_7"* ]] && [[ ! -e
/usr/lib64/libpython2.7.so ]] && emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --oneshot
dev-lang/python:2.7
# disable python in git if we have to, it only supports python-2.7
-if [[ "${GENTOO_PYTHON_TARGETS}" != *"python2_7"* ]]; then
- echo 'dev-vcs/git -python' >> /etc/portage/package.use/git
-fi
+[[ "${GENTOO_PYTHON_TARGETS}" != *"python2_7"* ]] && echo 'dev-vcs/git
-python' >> /etc/portage/package.use/git
+
# make sure we have the new python for portage bevore we possibly remove
python 2.7
# this is done one by one with nodeps because it can sometimes have dependency
loops
-PYTHON_PACKAGES="dev-python/six dev-python/packaging dev-python/pyparsing
dev-python/appdirs dev-python/setuptools dev-python/certifi"
+PYTHON_PACKAGES="dev-python/six dev-python/packaging dev-python/appdirs
dev-python/setuptools dev-python/pyparsing dev-python/certifi"
for PACKAGE in ${PYTHON_PACKAGES}; do
emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --oneshot --update --newuse --deep
--nodeps "${PACKAGE}"
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
2019-08-21 23:48:02.000000000 +0200
@@ -38,29 +38,29 @@
# default/linux/amd64/13.0/no-multilib
# hardened/linux/amd64
# hardened/linux/amd64/no-multilib
-GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/17.0'}
-if [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0" ]]; then
+GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/17.1'}
+if [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1" ]]; then
FILENAME_BASE='gentoo-stage4'
SIGNED_SOURCE_SUFFIX='minimal'
-elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then
+elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/no-multilib" ]]; then
FILENAME_BASE='gentoo-stage4-nomultilib'
SIGNED_SOURCE_SUFFIX='minimal-nomultilib'
-elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/hardened" ]]; then
+elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/hardened" ]]; then
FILENAME_BASE='gentoo-stage4-hardened'
SIGNED_SOURCE_SUFFIX='hardened+minimal'
-elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/no-multilib/hardened"
]]; then
+elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/no-multilib/hardened"
]]; then
FILENAME_BASE='gentoo-stage4-hardened-nomultilib'
SIGNED_SOURCE_SUFFIX='hardened+minimal-nomultilib'
-elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/systemd" ]]; then
+elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/systemd" ]]; then
FILENAME_BASE='gentoo-stage4-systemd'
SIGNED_SOURCE_SUFFIX='systemd'
else
echo 'invalid profile, please select from the following profiles'
- echo 'default/linux/amd64/17.0'
- echo 'default/linux/amd64/17.0/no-multilib'
- echo 'default/linux/amd64/17.0/hardened'
- echo 'default/linux/amd64/17.0/no-multilib/hardened'
- echo 'default/linux/amd64/17.0/systemd'
+ echo 'default/linux/amd64/17.1'
+ echo 'default/linux/amd64/17.1/no-multilib'
+ echo 'default/linux/amd64/17.1/hardened'
+ echo 'default/linux/amd64/17.1/no-multilib/hardened'
+ echo 'default/linux/amd64/17.1/systemd'
exit 1
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/root.d/50-gentoo-cache
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/root.d/50-gentoo-cache
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/gentoo/root.d/50-gentoo-cache
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/gentoo/root.d/50-gentoo-cache
2019-08-21 23:48:02.000000000 +0200
@@ -13,8 +13,9 @@
GENTOO_PORTAGE_DIR="${DIB_IMAGE_CACHE}/gentoo/portage"
mkdir -p "${GENTOO_PORTAGE_DIR}" "${GENTOO_PORTAGE_PACKAGE_DIR}"
"${GENTOO_PORTAGE_DISTFILES_DIR}"
-sudo mount --bind "${GENTOO_PORTAGE_DIR}" "${TMP_MOUNT_PATH}"/usr/portage
-mkdir -p "${TMP_MOUNT_PATH}"/usr/portage/distfiles
-sudo mount --bind "${GENTOO_PORTAGE_DISTFILES_DIR}"
"${TMP_MOUNT_PATH}"/usr/portage/distfiles
-mkdir -p "${TMP_MOUNT_PATH}"/usr/portage/packages
-sudo mount --bind "${GENTOO_PORTAGE_PACKAGE_DIR}"
"${TMP_MOUNT_PATH}"/usr/portage/packages
+mkdir -p "${TMP_MOUNT_PATH}${PORTDIR}"
+sudo mount --bind "${GENTOO_PORTAGE_DIR}" "${TMP_MOUNT_PATH}${PORTDIR}"
+mkdir -p "${TMP_MOUNT_PATH}${DISTDIR}"
+sudo mount --bind "${GENTOO_PORTAGE_DISTFILES_DIR}"
"${TMP_MOUNT_PATH}${DISTDIR}"
+mkdir -p "${TMP_MOUNT_PATH}${PKGDIR}"
+sudo mount --bind "${GENTOO_PORTAGE_PACKAGE_DIR}" "${TMP_MOUNT_PATH}${PKGDIR}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/journal-to-console/README.rst
new/diskimage-builder-2.26.1/diskimage_builder/elements/journal-to-console/README.rst
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/journal-to-console/README.rst
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/journal-to-console/README.rst
2019-08-21 23:48:06.000000000 +0200
@@ -0,0 +1,10 @@
+==================
+journal-to-console
+==================
+
+Configure systemd's journal to send all logs to console. Useful for
+debugging issues before you can log into a host, such as network or
+authentication issues.
+
+The console can be retrieved from an OpenStack cloud with a command
+such as ``openstack console log show <server>``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/journal-to-console/post-install.d/30-journal-to-console
new/diskimage-builder-2.26.1/diskimage_builder/elements/journal-to-console/post-install.d/30-journal-to-console
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/journal-to-console/post-install.d/30-journal-to-console
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/journal-to-console/post-install.d/30-journal-to-console
2019-08-21 23:48:06.000000000 +0200
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# Copyright 2019 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+set -eu
+set -o pipefail
+
+mkdir -p /etc/systemd/journald.conf.d
+
+cat > /etc/systemd/journald.conf.d/log-to-console.conf << EOF
+[Journal]
+ForwardToConsole=true
+EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror
new/diskimage-builder-2.26.1/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror
2019-08-21 23:48:06.000000000 +0200
@@ -57,8 +57,10 @@
output.write('trusted-host = %s\n' % (urlparse(indices[0]).hostname,))
if retries is not None:
output.write('retries = %s\n' % retries)
- for index in indices[1:]:
- output.write('extra-index-url = %s\n' % (index,))
+ if len(indices) > 1:
+ output.write('extra-index-url =\n')
+ for index in indices[1:]:
+ output.write(' %s\n' % (index,))
with open(home + '/.pydistutils.cfg', 'wt') as output:
output.write('[easy_install]\n')
output.write('index_url = %s\n' % (easy_index,))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/rhel/pre-install.d/02-set-machine-id
new/diskimage-builder-2.26.1/diskimage_builder/elements/rhel/pre-install.d/02-set-machine-id
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/rhel/pre-install.d/02-set-machine-id
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/rhel/pre-install.d/02-set-machine-id
2019-08-21 23:48:06.000000000 +0200
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+ set -x
+fi
+set -eu
+set -o pipefail
+
+# Set a machine-id. The .qcow2 image doesn't have one, and sometimes
+# one will get made (if systemd is upgraded as part of the build
+# process) and sometimes not. The problem is that certain kernel
+# install scripts bail silently without it; kernel packages end up
+# being installed but the initramfs etc isn't copied into place.
+#
+# Note this is cleared out in the sysprep role.
+#
+# See also:
+# 768c5e188c1b4bff01da14a49b96b51301db4c03 : similar thing for fedora
+# https://bugzilla.redhat.com/show_bug.cgi?id=1737355 : upstream bug
+# https://bugzilla.redhat.com/show_bug.cgi?id=1486124 : unresolved
+# bug about kernel install requiring machine-id
+
+systemd-machine-id-setup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/simple-init/post-install.d/80-simple-init
new/diskimage-builder-2.26.1/diskimage_builder/elements/simple-init/post-install.d/80-simple-init
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/simple-init/post-install.d/80-simple-init
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/simple-init/post-install.d/80-simple-init
2019-08-21 23:48:06.000000000 +0200
@@ -48,5 +48,6 @@
# Debian has a many year old long bug report detailing this behavior with
# the most interesting comment being at the end:
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755202#331
- echo 'net.ipv6.conf.default.router_solicitation_delay=15' >>
/etc/sysctl.conf
+
DIB_SIMPLE_INIT_NETWORKMANAGER_IPV6_DELAY=${DIB_SIMPLE_INIT_NETWORKMANAGER_IPV6_DELAY:-30}
+ echo
"net.ipv6.conf.default.router_solicitation_delay=${DIB_SIMPLE_INIT_NETWORKMANAGER_IPV6_DELAY}"
>> /etc/sysctl.conf
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/ubuntu/pre-install.d/01-set-ubuntu-mirror
new/diskimage-builder-2.26.1/diskimage_builder/elements/ubuntu/pre-install.d/01-set-ubuntu-mirror
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/ubuntu/pre-install.d/01-set-ubuntu-mirror
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/ubuntu/pre-install.d/01-set-ubuntu-mirror
2019-08-21 23:48:07.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
-if [ ${DIB_DEBUG_TRACE:-0} -gt 1 ]; then
+if [[ ${DIB_DEBUG_TRACE:-0} -gt 1 ]]; then
set -x
fi
set -eu
@@ -8,11 +8,11 @@
DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-}
-[ -n "$DIB_DISTRIBUTION_MIRROR" ] || exit 0
+[[ -n "$DIB_DISTRIBUTION_MIRROR" ]] || exit 0
while IFS= read line
do
- if [[ "$line" =~ ${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-} ]]; then
+ if [[ -n "${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-}" && "$line" =~
${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-} ]]; then
# append line unmodified
echo "$line" | tee --append /etc/apt/sources.list.new
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot
new/diskimage-builder-2.26.1/diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot
---
old/diskimage-builder-2.25.0/diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot
2019-07-15 05:11:00.000000000 +0200
+++
new/diskimage-builder-2.26.1/diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot
2019-08-21 23:48:16.000000000 +0200
@@ -101,6 +101,11 @@
${DIB_OPENSUSE_PATTERNS} ${ZYPPER_INSTALL_SYSTEM_PYTHON} \
zypper sudo ca-certificates-mozilla
+# Remove the installed symlink, otherwise we wipe the resolv.conf
+# outside the target_root (as the link is not relative)
+# outside target_root
+test -L $TARGET_ROOT/etc/resolv.conf && sudo rm -f $TARGET_ROOT/etc/resolv.conf
+
# Put in a dummy /etc/resolv.conf over the temporary one we used
# to bootstrap. systemd has a bug/feature [1] that it will assume
# you want systemd-networkd as the network manager and create a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/lib/disk-image-create
new/diskimage-builder-2.26.1/diskimage_builder/lib/disk-image-create
--- old/diskimage-builder-2.25.0/diskimage_builder/lib/disk-image-create
2019-07-15 05:11:00.000000000 +0200
+++ new/diskimage-builder-2.26.1/diskimage_builder/lib/disk-image-create
2019-08-21 23:48:07.000000000 +0200
@@ -446,6 +446,18 @@
fi
fi
+# EFI system partitions default to be quite large at 512mb for maximum
+# compatability (see notes in
+# 7fd52ba84180b4e749ccf4c9db8c49eafff46ea8) . We need to increase the
+# total size to account for this, or we run out of space creating the
+# final image. See if we have included the block-device-efi element,
+# which implies we have a large EFI partition, and then pad the final
+# image size.
+if [[ ${IMAGE_ELEMENT} =~ "block-device-efi" ]]; then
+ echo "Expanding disk for EFI partition"
+ du_size=$(( $du_size + (525 * 1024) ))
+fi
+
# Rounding down size so that is is a multiple of 64, works around a bug in
# qemu-img that may occur when compressing raw images that aren't a multiple
# of 64k. https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1180021
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/lib/outfilter.py
new/diskimage-builder-2.26.1/diskimage_builder/lib/outfilter.py
--- old/diskimage-builder-2.25.0/diskimage_builder/lib/outfilter.py
2019-07-15 05:11:00.000000000 +0200
+++ new/diskimage-builder-2.26.1/diskimage_builder/lib/outfilter.py
2019-08-21 23:48:07.000000000 +0200
@@ -26,7 +26,7 @@
import re
import sys
-IGNORE_LINES = re.compile('(set \+o|xtrace)')
+IGNORE_LINES = re.compile(r'(set \+o|xtrace)')
def get_options():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder/lib/ramdisk-image-create
new/diskimage-builder-2.26.1/diskimage_builder/lib/ramdisk-image-create
--- old/diskimage-builder-2.25.0/diskimage_builder/lib/ramdisk-image-create
2019-07-15 05:11:00.000000000 +0200
+++ new/diskimage-builder-2.26.1/diskimage_builder/lib/ramdisk-image-create
2019-08-21 23:48:07.000000000 +0200
@@ -446,6 +446,18 @@
fi
fi
+# EFI system partitions default to be quite large at 512mb for maximum
+# compatability (see notes in
+# 7fd52ba84180b4e749ccf4c9db8c49eafff46ea8) . We need to increase the
+# total size to account for this, or we run out of space creating the
+# final image. See if we have included the block-device-efi element,
+# which implies we have a large EFI partition, and then pad the final
+# image size.
+if [[ ${IMAGE_ELEMENT} =~ "block-device-efi" ]]; then
+ echo "Expanding disk for EFI partition"
+ du_size=$(( $du_size + (525 * 1024) ))
+fi
+
# Rounding down size so that is is a multiple of 64, works around a bug in
# qemu-img that may occur when compressing raw images that aren't a multiple
# of 64k. https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1180021
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder.egg-info/PKG-INFO
new/diskimage-builder-2.26.1/diskimage_builder.egg-info/PKG-INFO
--- old/diskimage-builder-2.25.0/diskimage_builder.egg-info/PKG-INFO
2019-07-15 05:11:51.000000000 +0200
+++ new/diskimage-builder-2.26.1/diskimage_builder.egg-info/PKG-INFO
2019-08-21 23:49:26.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: diskimage-builder
-Version: 2.25.0
+Version: 2.26.1
Summary: Golden Disk Image builder.
Home-page: https://docs.openstack.org/diskimage-builder/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder.egg-info/SOURCES.txt
new/diskimage-builder-2.26.1/diskimage_builder.egg-info/SOURCES.txt
--- old/diskimage-builder-2.25.0/diskimage_builder.egg-info/SOURCES.txt
2019-07-15 05:11:51.000000000 +0200
+++ new/diskimage-builder-2.26.1/diskimage_builder.egg-info/SOURCES.txt
2019-08-21 23:49:26.000000000 +0200
@@ -355,6 +355,7 @@
diskimage_builder/elements/gentoo/extra-data.d/gentoo-releng.gpg
diskimage_builder/elements/gentoo/finalise.d/99-cleanup
diskimage_builder/elements/gentoo/pre-finalise.d/01-gentoo-cache
+diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-00-set-profile
diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-01-migrate-pax
diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags
diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays
@@ -447,6 +448,8 @@
diskimage_builder/elements/iso/pkg-map
diskimage_builder/elements/iso/cleanup.d/100-build-iso
diskimage_builder/elements/iso/post-install.d/01-copy-bootloaders
+diskimage_builder/elements/journal-to-console/README.rst
+diskimage_builder/elements/journal-to-console/post-install.d/30-journal-to-console
diskimage_builder/elements/local-config/README.rst
diskimage_builder/elements/local-config/element-deps
diskimage_builder/elements/local-config/environment.d/62-ssh-key
@@ -609,6 +612,7 @@
diskimage_builder/elements/rhel-common/pre-install.d/10-rhel-blacklist
diskimage_builder/elements/rhel/environment.d/10-rhel-distro-name.bash
diskimage_builder/elements/rhel/environment.d/11-yum-dnf.bash
+diskimage_builder/elements/rhel/pre-install.d/02-set-machine-id
diskimage_builder/elements/rhel/root.d/10-rhel-cloud-image
diskimage_builder/elements/rhel7/README.rst
diskimage_builder/elements/rhel7/element-deps
@@ -840,6 +844,7 @@
releasenotes/notes/dibv2-omnibus-b30e0c7ecd76db8d.yaml
releasenotes/notes/doc-auto-element-dependency-cb7488c5bb7301a4.yaml
releasenotes/notes/dracut-network-adaabf90da9f6866.yaml
+releasenotes/notes/efi-bootloader-disk-size-4c1a9f18967104fb.yaml
releasenotes/notes/element-info-entry-point-448bf622be6061a0.yaml
releasenotes/notes/element-override-ccda78c24ab4a4ff.yaml
releasenotes/notes/element-vars-c6bf2e6795002f01.yaml
@@ -851,6 +856,7 @@
releasenotes/notes/image-size-padding-mb-574104d40fdd2345.yaml
releasenotes/notes/incorrect-grub-label-5d2000215c0cc73e.yaml
releasenotes/notes/init-ibft-interfaces-9458d97dfcecc3ae.yaml
+releasenotes/notes/journal-console-752b46542ec5595e.yaml
releasenotes/notes/logfile-quiet-b18f2de4059eecfd.yaml
releasenotes/notes/move_tidy_logs_to_main-a8c03427fe1a445c.yaml
releasenotes/notes/openssh-server-0f6d065748a2fc18.yaml
@@ -867,6 +873,7 @@
releasenotes/notes/root-journal-size-618e064d6681699a.yaml
releasenotes/notes/runtime-ssh-host-keys-7a2fc873cc90d33e.yaml
releasenotes/notes/selinux-permissive-pre-install-ce19461ef17ec972.yaml
+releasenotes/notes/simple-init-nm-delay-f579e05467785219.yaml
releasenotes/notes/simple-init-nm-f0896124dee92a03.yaml
releasenotes/notes/skip-packages-env-c97e7b4820f9bfda.yaml
releasenotes/notes/squashfs-output-91c1f0dc37474d3c.yaml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/diskimage_builder.egg-info/pbr.json
new/diskimage-builder-2.26.1/diskimage_builder.egg-info/pbr.json
--- old/diskimage-builder-2.25.0/diskimage_builder.egg-info/pbr.json
2019-07-15 05:11:51.000000000 +0200
+++ new/diskimage-builder-2.26.1/diskimage_builder.egg-info/pbr.json
2019-08-21 23:49:26.000000000 +0200
@@ -1 +1 @@
-{"git_version": "f35d29c3", "is_release": true}
\ No newline at end of file
+{"git_version": "76b09c84", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/releasenotes/notes/efi-bootloader-disk-size-4c1a9f18967104fb.yaml
new/diskimage-builder-2.26.1/releasenotes/notes/efi-bootloader-disk-size-4c1a9f18967104fb.yaml
---
old/diskimage-builder-2.25.0/releasenotes/notes/efi-bootloader-disk-size-4c1a9f18967104fb.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.26.1/releasenotes/notes/efi-bootloader-disk-size-4c1a9f18967104fb.yaml
2019-08-21 23:48:07.000000000 +0200
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ When using the ``block-device-efi`` element to create an EFI based
+ system (most notably, with ARM64), the final disk size is now
+ expanded for the 512MiB system EFI partition introduced with 2.24.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/releasenotes/notes/journal-console-752b46542ec5595e.yaml
new/diskimage-builder-2.26.1/releasenotes/notes/journal-console-752b46542ec5595e.yaml
---
old/diskimage-builder-2.25.0/releasenotes/notes/journal-console-752b46542ec5595e.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.26.1/releasenotes/notes/journal-console-752b46542ec5595e.yaml
2019-08-21 23:48:07.000000000 +0200
@@ -0,0 +1,6 @@
+---
+features:
+ - |
+ The ``journal-to-console`` element is added to allow forwarding
+ systemd output to the host console. This is useful for debugging
+ early boot issues.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.25.0/releasenotes/notes/simple-init-nm-delay-f579e05467785219.yaml
new/diskimage-builder-2.26.1/releasenotes/notes/simple-init-nm-delay-f579e05467785219.yaml
---
old/diskimage-builder-2.25.0/releasenotes/notes/simple-init-nm-delay-f579e05467785219.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.26.1/releasenotes/notes/simple-init-nm-delay-f579e05467785219.yaml
2019-08-21 23:48:07.000000000 +0200
@@ -0,0 +1,11 @@
+---
+fixes:
+ - |
+ The ``DIB_SIMPLE_INIT_NETWORKMANAGER_IPV6_DELAY`` variable is
+ added for the ``simple-init`` element to set the
+ ``net.ipv6.conf.default.router_solicition_delay`` sysctl setting
+ (it defaults to 30s). If you are seeing an extra "blank"
+ interface in ``nmcli con show`` it is likely that NM has not
+ correctly configured itself in the presence of an interface
+ already configured with IPV6 by the kernel. Increasing this value
+ may help work-around the problem.
