From: Daan De Meyer Date: Thu, 9 Feb 2023 21:11:53 +0000 (+0100) Subject: centos: Do not try to resolve symlink X-Git-Tag: v15~334 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd550fa264530986ec1c8b786c4501572a040192;p=thirdparty%2Fmkosi.git centos: Do not try to resolve symlink We don't have chase_symlinks(), resolving the symlink actually resolves it on the host instead of in the image. Instead, let's just unconditionally remove the symlink. --- diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py index d1e85c3c7..d8fb01adc 100644 --- a/mkosi/distributions/centos.py +++ b/mkosi/distributions/centos.py @@ -6,7 +6,7 @@ from pathlib import Path from mkosi.backend import Distribution, MkosiConfig, MkosiState, add_packages from mkosi.distributions import DistributionInstaller from mkosi.distributions.fedora import Repo, install_packages_dnf, invoke_dnf, setup_dnf -from mkosi.log import MkosiPrinter, complete_step, die +from mkosi.log import complete_step, die from mkosi.remove import unlink_try_hard from mkosi.run import run_workspace_command @@ -81,8 +81,7 @@ class CentosInstaller(DistributionInstaller): install_packages_dnf(state, packages, env) syslog = state.root.joinpath("etc/systemd/system/syslog.service") - if release <= 8 and syslog.is_symlink() and not syslog.exists(): - MkosiPrinter.info("Removing dangling syslog.service symlink") + if release <= 8 and syslog.is_symlink(): syslog.unlink() # On Fedora, the default rpmdb has moved to /usr/lib/sysimage/rpm so if that's the case we need to