Skip to content

Commit 5f85817

Browse files
DaanDeMeyerbluca
authored andcommitted
Move various tmpfiles snippets from debian specific to generic file
1 parent f93c8e0 commit 5f85817

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,6 @@ L? /etc/gdm3
99
# On Debian/Ubuntu the nftable service fails if this config is not present
1010
L? /etc/nftables.conf
1111

12-
# Very basic stuff like awk and which is managed through alternatives
13-
L? /etc/alternatives
14-
15-
# CUPS is pulled in by GNOME, and fails if the configs are not there
16-
L? /etc/cups
17-
18-
# Needed to create users by GNOME's GUI
19-
L? /etc/skel
2012
# These can be dropped once https://bugs.debian.org/1108017 is fixed
2113
L? /etc/adduser.conf
2214
L? /etc/deluser.conf
23-
24-
# PackageKit does not run without /etc/PackageKit/ and GNOME stalls logout/reboot if it doesn't run
25-
L? /etc/PackageKit
26-
27-
# TODO: drop once https://github.com/scop/bash-completion/pull/1399 is merged, needed for shell completion of sd-run/run0
28-
L? /etc/bash_completion.d

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ L /etc/security
1515
L? /etc/bashrc
1616
L? /etc/bash.bashrc
1717
L? /etc/bash.bash_logout
18+
# TODO: drop once https://github.com/scop/bash-completion/pull/1399 is merged,
19+
# needed for shell completion of sd-run/run0
20+
L? /etc/bash_completion.d
1821
# Canonical location to look for certificates
1922
L? /etc/ca-certificates
2023
L? /etc/crypto-policies
@@ -51,3 +54,12 @@ L? /etc/geoclue
5154
L /etc/fwupd
5255
# Required by gnome
5356
L? /etc/dconf
57+
L? /etc/skel
58+
# CUPS is pulled in by GNOME, and fails if the configs are not there
59+
L? /etc/cups
60+
# On some distributions various binaries in /usr/bin are managed via
61+
# /etc/alternatives.
62+
L? /etc/alternatives
63+
# PackageKit does not run without /etc/PackageKit/ and GNOME stalls
64+
# logout/reboot if it doesn't run.
65+
L? /etc/PackageKit

0 commit comments

Comments
 (0)