From 1c850a58e70ebbc5b33f4373e1c060aa2787952d Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 23 Aug 2022 01:08:58 +0100 Subject: [PATCH] debian/ubuntu: actually use args.mirror It was configured but never actually used --- mkosi/__init__.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index a9aa246e9..14a2010bd 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -2474,15 +2474,12 @@ def add_apt_auxiliary_repos(args: MkosiArgs, root: Path, repos: Set[str]) -> Non if args.release in ("unstable", "sid"): return - if args.distribution == Distribution.ubuntu: - updates = f"deb http://archive.ubuntu.com/ubuntu {args.release}-updates {' '.join(repos)}" - else: - updates = f"deb http://deb.debian.org/debian {args.release}-updates {' '.join(repos)}" - + updates = f"deb {args.mirror} {args.release}-updates {' '.join(repos)}" root.joinpath(f"etc/apt/sources.list.d/{args.release}-updates.list").write_text(f"{updates}\n") + # Security updates repos are never mirrored if args.distribution == Distribution.ubuntu: - security = f"deb http://archive.ubuntu.com/ubuntu {args.release}-security {' '.join(repos)}" + security = f"deb http://security.ubuntu.com/ubuntu/ {args.release}-security {' '.join(repos)}" elif args.release in ("stretch", "buster"): security = f"deb http://security.debian.org/debian-security/ {args.release}/updates main" else: @@ -2618,10 +2615,7 @@ def install_debian_or_ubuntu(args: MkosiArgs, root: Path, *, do_run_build_script # Now clean up and add the real repositories, so that the image is ready if args.local_mirror: - if args.distribution == Distribution.ubuntu: - main_repo = f"deb http://archive.ubuntu.com/ubuntu {args.release} {' '.join(repos)}\n" - else: - main_repo = f"deb http://deb.debian.org/debian {args.release} {' '.join(repos)}\n" + main_repo = f"deb {args.mirror} {args.release} {' '.join(repos)}\n" root.joinpath("etc/apt/sources.list").write_text(main_repo) root.joinpath("etc/apt/sources.list.d/mirror.list").unlink() add_apt_auxiliary_repos(args, root, repos) -- 2.47.2