From: Daan De Meyer Date: Sat, 15 Apr 2023 17:40:50 +0000 (+0200) Subject: Fix comments X-Git-Tag: v15~246^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dddea727dfead9f8fc92a6ae883f78976fbe7094;p=thirdparty%2Fmkosi.git Fix comments --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 7d1dd4f3a..8971898e5 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -555,8 +555,6 @@ def install_extra_trees(state: MkosiState) -> None: if source.is_dir(): copy_path(source, t, preserve_owner=False) else: - # unpack_archive() groks Paths, but mypy doesn't know this. - # Pretend that tree is a str. shutil.unpack_archive(source, t) diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py index 5fb431364..3bda19652 100644 --- a/mkosi/distributions/debian.py +++ b/mkosi/distributions/debian.py @@ -84,7 +84,7 @@ class DebianInstaller(DistributionInstaller): state.root.joinpath("etc/apt/sources.list.d/mirror.list").unlink() cls._add_apt_auxiliary_repos(state, repos) - # Don't enable any services by default. + # Make sure preset doesn't touch services unless explicitly configured. presetdir = state.root / "etc/systemd/system-preset" presetdir.mkdir(exist_ok=True, mode=0o755) presetdir.joinpath("99-mkosi-ignore.preset").write_text("ignore *") diff --git a/mkosi/install.py b/mkosi/install.py index b95e3e067..ec3557227 100644 --- a/mkosi/install.py +++ b/mkosi/install.py @@ -82,6 +82,4 @@ def install_skeleton_trees(state: MkosiState, cached: bool, *, late: bool=False) if source.is_dir(): copy_path(source, t, preserve_owner=False) else: - # unpack_archive() groks Paths, but mypy doesn't know this. - # Pretend that tree is a str. shutil.unpack_archive(source, t)