From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 21 Feb 2023 12:03:36 +0000 (+0100)
Subject: mkosi: Drop opensuse workaround
X-Git-Tag: v254-rc1~1216^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfe6bd1789258287ef6fbed3bf569bbfb1f38e82;p=thirdparty%2Fsystemd.git

mkosi: Drop opensuse workaround
---

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