mirror of
https://github.com/BigfootACA/arch-image-builder.git
synced 2024-09-21 17:30:55 +08:00
Compare commits
7 Commits
ae6bf55e2b
...
abadeb646c
Author | SHA1 | Date | |
---|---|---|---|
|
abadeb646c | ||
|
1bc5af460e | ||
|
daa0930f8e | ||
|
6e7b87f3dc | ||
|
0874ec6fdf | ||
|
94804ec8d9 | ||
|
7b1e8f7dd9 |
@ -151,9 +151,6 @@ 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):
|
||||||
"""
|
"""
|
||||||
@ -305,6 +302,9 @@ 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"]
|
||||||
|
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
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