Skip to content

Commit 8bc4a6b

Browse files
authored
Merge pull request #69 from bluca/debian_gnome
Enable flathub by default on desktops, install efibootmgr and kexec-tools, and assorted Debian changes
2 parents b06d1c5 + 560a157 commit 8bc4a6b

File tree

19 files changed

+91
-4
lines changed

19 files changed

+91
-4
lines changed

mkosi.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ Packages=
4242
diffutils
4343
dmidecode
4444
dosfstools
45+
e2fsprogs
46+
efibootmgr
4547
erofs-utils
48+
exfatprogs
49+
file
4650
findutils
4751
fish
4852
fwupd
@@ -52,6 +56,7 @@ Packages=
5256
gzip
5357
jq
5458
kbd
59+
kexec-tools
5560
kmod
5661
less
5762
man
@@ -61,6 +66,7 @@ Packages=
6166
nvme-cli
6267
opensc
6368
openssl
69+
patch
6470
p11-kit
6571
pciutils
6672
pkcs11-provider
@@ -78,6 +84,7 @@ Packages=
7884
wireguard-tools
7985
xxd
8086
yubikey-manager
87+
zip
8188
zstd
8289

8390
VolatilePackages=

mkosi.conf.d/arch/mkosi.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Packages=
1818
libfido2
1919
linux
2020
man-db
21+
man-pages
2122
openssh
2223
pacman
2324
pcsclite
@@ -27,12 +28,15 @@ Packages=
2728
psmisc
2829
python3
2930
qrencode
31+
sbsigntools
3032
shadow
3133
systemd-ukify
3234
tgt
3335
tpm2-tools
3436
tpm2-tss
3537
vim-minimal
38+
wget
39+
xz
3640
zram-generator
3741

3842
VolatilePackages=

mkosi.conf.d/debian/mkosi.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Repositories=non-free-firmware
99

1010
[Content]
1111
Packages=
12+
apparmor
1213
apt
1314
bpftool
1415
ca-certificates
@@ -28,7 +29,9 @@ Packages=
2829
libqrencode4
2930
linux-image-generic
3031
linux-perf
32+
linux-sysctl-defaults
3133
login
34+
manpages
3235
openssh-client
3336
openssh-server
3437
passwd
@@ -37,7 +40,10 @@ Packages=
3740
polkitd
3841
procps
3942
python3
43+
sbsigntool
4044
systemd-boot
45+
systemd-boot-efi
46+
systemd-boot-efi-signed
4147
systemd-container
4248
systemd-coredump
4349
systemd-cryptsetup
@@ -49,13 +55,18 @@ Packages=
4955
systemd-ukify
5056
systemd-zram-generator
5157
tpm2-tools
58+
util-linux-extra
59+
wget
60+
xz-utils
5261

5362
VolatilePackages=
5463
libnss-myhostname
5564
libnss-mymachines
5665
libnss-systemd
5766
libpam-systemd
5867
systemd-boot
68+
systemd-boot-efi
69+
systemd-boot-efi-signed
5970
systemd-container
6071
systemd-coredump
6172
systemd-cryptsetup
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# apt gets pulled in, but with /usr read-only doesn't make sense to run updates
2+
disable apt-daily.timer
3+
disable apt-daily-upgrade.timer
4+
disable apt-listchanges.timer
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# TODO: drop after https://salsa.debian.org/printing-team/cups/-/merge_requests/11 is merged
2+
g lpadmin
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# TODO: drop after https://gitlab.freedesktop.org/geoclue/geoclue/-/merge_requests/202 is merged
2+
u geoclue - - /var/lib/geoclue
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# TODO: drop after https://salsa.debian.org/tts-team/speech-dispatcher/-/merge_requests/6 is merged
2+
u speech-dispatcher - "Speech Dispatcher" /run/speech-dispatcher /bin/false
3+
m speech-dispatcher audio
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# TODO: drop after https://salsa.debian.org/debian/wpa/-/merge_requests/18 is merged
2+
g netdev

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,21 @@ L? /etc/gdm3
88

99
# On Debian/Ubuntu the nftable service fails if this config is not present
1010
L? /etc/nftables.conf
11+
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
20+
# These can be dropped once https://bugs.debian.org/1108017 is fixed
21+
L? /etc/adduser.conf
22+
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.conf.d/fedora/mkosi.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Packages=
2323
libcap-ng-utils
2424
libfido2
2525
man-db
26+
man-pages
2627
openssh
2728
openssh-clients
2829
openssh-server
@@ -35,6 +36,7 @@ Packages=
3536
procps-ng
3637
python3
3738
rpm
39+
sbsigntools
3840
systemd-boot
3941
systemd-container
4042
systemd-networkd
@@ -46,6 +48,8 @@ Packages=
4648
tpm2-tss
4749
veritysetup
4850
vim-minimal
51+
wget2
52+
xz
4953
zram-generator-defaults
5054

5155
VolatilePackages=

0 commit comments

Comments
 (0)