From d426e504aa674de613c3cd21e106d0dcec2d77b4 Mon Sep 17 00:00:00 2001 From: Ilyas Gasanov Date: Sun, 14 Apr 2019 00:09:10 +0300 Subject: Support extra sources.list and gpg keyring files. --- baiji | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/baiji b/baiji index 3ab1556..94ed60a 100755 --- a/baiji +++ b/baiji @@ -97,6 +97,10 @@ def fakeroot_filter(info): help = "mirror URL to pull packages from"), arg("--components", default = ["main"], nargs = "+", help = "repository components to use"), + arg("--lists", nargs = "+", + help = "additional files with sources.list entries"), + arg("--keyrings", nargs = "+", + help = "additional gpg keyring files"), ) def create(args): """ @@ -111,6 +115,13 @@ def create(args): "--foreign", "--variant=buildd", "--components={}".format(",".join(args.components)), args.dist, dn, args.mirror)) + for files, aptdir in ((args.lists, "sources.list.d"), + (args.keyrings, "trusted.gpg.d")): + if files is not None: + d = os.path.join(dn, "etc", "apt", aptdir) + os.makedirs(d) + for f in files: + shutil.copy(f, d) with Docker("import", "-", args.tag, stdin = subprocess.PIPE) as docker: with tarfile.open(mode = "w|", fileobj = docker.stdin) as tar: tar.add(dn, ".", filter = fakeroot_filter) -- cgit v1.2.3