From: Luca Boccassi Date: Tue, 2 Nov 2021 14:22:55 +0000 (+0000) Subject: debian: do not try to enable resolved if systemd is not in the package list X-Git-Tag: v11~9^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f75baf9e72aeff83c9e56c4795fd7544004754be;p=thirdparty%2Fmkosi.git debian: do not try to enable resolved if systemd is not in the package list It will not be installed, so it will fail --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index fed8d8dae..467410fae 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -2597,7 +2597,7 @@ def install_debian_or_ubuntu(args: CommandLineArguments, root: Path, *, do_run_b # Debian still has pam_securetty module enabled, disable it in the base image. disable_pam_securetty(root) - if args.distribution == Distribution.debian and args.base_image is None: + if args.distribution == Distribution.debian and "systemd" in extra_packages: # The default resolv.conf points to 127.0.0.1, and resolved is disabled, fix it in # the base image. root.joinpath("etc/resolv.conf").unlink()