From e3dd80fa06789d3c79edf707c26feaa50b6f88c3 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 17 Nov 2021 17:25:29 -0800 Subject: [PATCH] Vagrantfile.fedora: revert excluding systemd Since https://bugzilla.redhat.com/2022041 is fixed (in systemd-249.7-2.fc35), the exclude kludge can be dropped. This partially reverts commit b028ecb352c56269. Signed-off-by: Kir Kolyshkin --- Vagrantfile.fedora | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Vagrantfile.fedora b/Vagrantfile.fedora index 2c3df9abc..2fb304ff6 100644 --- a/Vagrantfile.fedora +++ b/Vagrantfile.fedora @@ -17,14 +17,10 @@ Vagrant.configure("2") do |config| # Work around dnf mirror failures by retrying a few times for i in $(seq 0 2); do sleep $i - # 1. "config exclude" dnf shell command is not working in Fedora 35 + # "config exclude" dnf shell command is not working in Fedora 35 # (see https://bugzilla.redhat.com/show_bug.cgi?id=2022571); # the workaround is to specify it as an option. - # 2. systemd 249.6-2.fc35 has a bug preventing rootless containers - # from starting when --systemd-cgroup is used for runc run - # (see https://bugzilla.redhat.com/show_bug.cgi?id=2022041), - # the workaround is not to upgrade systemd. - cat << EOF | dnf -y --exclude=kernel,kernel-core,systemd,systemd-* shell && break + cat << EOF | dnf -y --exclude=kernel,kernel-core shell && break config install_weak_deps false update install iptables gcc make golang-go glibc-static libseccomp-devel bats jq git-core criu