]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
centos: Do not try to resolve symlink
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 9 Feb 2023 21:11:53 +0000 (22:11 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 9 Feb 2023 22:13:57 +0000 (23:13 +0100)
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.

mkosi/distributions/centos.py

index d1e85c3c74bbd3fa8f7834a6dc43bfa7178f1b1b..d8fb01adc709e95214dbfaab9f120294ebe2d135 100644 (file)
@@ -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