Skip to content

Commit abf698a

Browse files
committed
Move pacman configuration bits out of mkosi.postinst
1 parent 6befb54 commit abf698a

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# SPDX-License-Identifier: LGPL-2.1-or-later
2+
3+
[options]
4+
DBPath = /usr/lib/pacman

mkosi.conf.d/20-arch/mkosi.postinst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,5 @@ rm -f "$BUILDROOT/usr/lib/tmpfiles.d/openssh.conf"
88
mkdir "$BUILDROOT/usr/lib/pacman"
99
mv "$BUILDROOT/var/lib/pacman/local" "$BUILDROOT/usr/lib/pacman"
1010

11-
cat >"$BUILDROOT/etc/pacman.conf" <<EOF
12-
[options]
13-
DBPath = /usr/lib/pacman
14-
EOF
15-
16-
cat >>"$BUILDROOT/usr/lib/tmpfiles.d/etc.conf" <<EOF
17-
L /etc/pacman.conf
18-
EOF
19-
2011
rm "$BUILDROOT/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist"
2112
mv "$BUILDROOT/etc/libccid_Info.plist" "$BUILDROOT/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist"

mkosi.extra/usr/lib/tmpfiles.d/etc.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ L /etc/ssh/sshd_config.d
2727
L /etc/ssl
2828
# Required by pam environment plugin
2929
L /etc/environment
30+
# pacman configuration file to look up the local database in /usr.
31+
L? /etc/pacman.conf
3032
# Contains the archlinux keyring required to build images
3133
L /etc/pacman.d
3234
# Required to generate desktop environment application menus

0 commit comments

Comments
 (0)