sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Only enable dbus-daemon for fedora-29 and below"

Browse Source
This commit is contained in:
Zuul 2019-05-07 05:47:57 +00:00 committed by Gerrit Code Review
commit 8c8b856c27
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-broker → diskimage_builder/elements/yum-minimal/install.d/11-ensure-dbus-daemon
View File

@ -21,12 +21,8 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
# Ensure that dbus-broker is enabled; it seems that because of the # Ensure that dbus-daemon is enabled; fedora 30 and above has switched to
# transition between dbus-daemon and dbus-broker (see # dbus-broker.
# https://pagure.io/fesco/issue/1853) the .spec files could possibly if [[ ${DISTRO_NAME} == 'fedora' && ${DIB_RELEASE} -le 29 ]]; then
# not enable this (likely related to ordering or something we do in systemctl --no-reload enable dbus-daemon.service
# the non-standardish chroot building) and a 2019 system with no dbus
# is very unhappy (networkmanager fails, etc).
if [[ ${DISTRO_NAME} == 'fedora' && ${DIB_RELEASE} -ge 29 ]]; then
systemctl --no-reload enable dbus-broker.service
fi fi

8
diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
View File

@ -278,14 +278,6 @@ _base_packages="systemd passwd findutils sudo util-linux-ng "
# https://bugzilla.redhat.com/show_bug.cgi?id=1398505 # https://bugzilla.redhat.com/show_bug.cgi?id=1398505
_base_packages+="systemd-udev " _base_packages+="systemd-udev "
# F29 moved to dbus-broker as the default, but dbus-daemon is
# still available. Explicitly pull it in; note we have an
# install.d script to enable the service explicitly it as this
# seems required.
if [[ ${DISTRO_NAME} = fedora && ${DIB_RELEASE} -ge 29 ]]; then
_base_packages+="dbus-broker"
fi
# bootstrap the environment within the chroot; bring in new # bootstrap the environment within the chroot; bring in new
# metadata with an update and install some base packages we need. # metadata with an update and install some base packages we need.
sudo -E chroot $TARGET_ROOT ${YUM} -y update sudo -E chroot $TARGET_ROOT ${YUM} -y update