mirror of
https://github.com/BigfootACA/arch-image-builder.git
synced 2024-09-21 17:30:55 +08:00
Compare commits
9 Commits
7b6ad9f88c
...
5894b1f985
Author | SHA1 | Date | |
---|---|---|---|
|
5894b1f985 | ||
|
ae6bf55e2b | ||
|
b1ec0e395c | ||
|
b2cf0aa266 | ||
|
ec208efbfb | ||
|
6bf17468b1 | ||
|
a7fabccdee | ||
|
8dcfde246c | ||
|
12afebaf46 |
@ -151,6 +151,9 @@ class Pacman:
|
|||||||
if ret != 0: raise OSError(f"wget failed with {ret}")
|
if ret != 0: raise OSError(f"wget failed with {ret}")
|
||||||
self.pacman_key(["--add", keypath])
|
self.pacman_key(["--add", keypath])
|
||||||
self.lsign_key(repo.keyid)
|
self.lsign_key(repo.keyid)
|
||||||
|
elif repo.keyid is not None:
|
||||||
|
self.recv_keys(repo.keyid)
|
||||||
|
self.lsign_key(repo.keyid)
|
||||||
|
|
||||||
def init_config(self):
|
def init_config(self):
|
||||||
"""
|
"""
|
||||||
@ -302,9 +305,6 @@ class Pacman:
|
|||||||
if "publickey" in repo and "keyid" not in repo:
|
if "publickey" in repo and "keyid" not in repo:
|
||||||
raise ArchBuilderConfigError("publickey is provided without keyid")
|
raise ArchBuilderConfigError("publickey is provided without keyid")
|
||||||
|
|
||||||
if "keyid" in repo and "publickey" not in repo:
|
|
||||||
raise ArchBuilderConfigError("keyid is provided without publickey")
|
|
||||||
|
|
||||||
if "publickey" in repo:
|
if "publickey" in repo:
|
||||||
pacman_repo.publickey = repo["publickey"]
|
pacman_repo.publickey = repo["publickey"]
|
||||||
|
|
||||||
|
17
configs/common/pacman-init.yaml
Normal file
17
configs/common/pacman-init.yaml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
filesystem:
|
||||||
|
files:
|
||||||
|
- path: /etc/systemd/system/wait-addresses@.service
|
||||||
|
content: |
|
||||||
|
[Unit]
|
||||||
|
Description=Initializes Pacman keyring
|
||||||
|
Requires=etc-pacman.d-gnupg.mount
|
||||||
|
After=etc-pacman.d-gnupg.mount time-sync.target
|
||||||
|
BindsTo=etc-pacman.d-gnupg.mount
|
||||||
|
Before=archlinux-keyring-wkd-sync.service
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
RemainAfterExit=yes
|
||||||
|
ExecStart=/usr/bin/pacman-key --init
|
||||||
|
ExecStart=/usr/bin/pacman-key --populate
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
Loading…
Reference in New Issue
Block a user