From bfe6bd1789258287ef6fbed3bf569bbfb1f38e82 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 21 Feb 2023 13:03:36 +0100 Subject: [PATCH] mkosi: Drop opensuse workaround --- mkosi.postinst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mkosi.postinst b/mkosi.postinst index cf6f9df391d..fc2aeabf4e7 100755 --- a/mkosi.postinst +++ b/mkosi.postinst @@ -18,13 +18,3 @@ EOF # Make sure dnsmasq.service doesn't start on boot on Debian/Ubuntu. rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service fi - -# Temporary workaround until https://github.com/openSUSE/suse-module-tools/commit/158643414ddb8d8208016a5f03a4484d58944d7a -# gets into OpenSUSE repos -if [ "$1" = "final" ] && grep -q openSUSE /etc/os-release; then - if [ -e "/usr/lib/systemd/system/boot-sysctl.service" ] && \ - ! grep -F -q 'ConditionPathExists=/boot/sysctl.conf' "/usr/lib/systemd/system/boot-sysctl.service"; then - mkdir -p "/etc/systemd/system/boot-sysctl.service.d/" - printf '[Unit]\nConditionPathExists=/boot/sysctl.conf-%%v' >"/etc/systemd/system/boot-sysctl.service.d/99-temporary-workaround.conf" - fi -fi -- 2.47.3