Skip to content

Commit 880b26e

Browse files
committed
chore(sysupdate): clean after merges with major refactor
Signed-off-by: Tulip Blossom <tulilirockz@outlook.com>
1 parent 328162d commit 880b26e

8 files changed

Lines changed: 17 additions & 31 deletions

File tree

mkosi.profiles/bootc-ostree/mkosi.conf

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ RemoveFiles=
55
/var/
66
/boot/*
77

8-
Packages=
9-
bootc
10-
bootupd
11-
rpm-ostree
12-
ostree
13-
uupd
14-
15-
[Build]
16-
ToolsTreePackages=ostree
17-
188
[Content]
199
# We want to use the bootc/ostree dracut modules instead of letting mkosi handle this. Please reconsider once arbitrary content can be added to the initramfs somehow
2010
Bootable=no

mkosi.profiles/bootc-ostree/mkosi.conf.d/bootloader-x64.conf

Lines changed: 0 additions & 8 deletions
This file was deleted.

mkosi.profiles/bootc-ostree/mkosi.conf.d/fedora/mkosi.conf.d/bootc.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
Packages=
33
bootc
44
bootupd
5-
rpm-ostree
65
ostree
6+
rpm-ostree

mkosi.profiles/bootc-ostree/mkosi.conf.d/fedora/mkosi.conf.d/extra.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
Repositories=terra
33

44
[Content]
5-
Packages=
6-
uupd
5+
Packages=uupd

mkosi.profiles/sysupdate/mkosi.conf

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ KernelCommandLine=
2525
rd.systemd.debug-shell=ttyS0
2626
ipe.enforce=0
2727

28-
VolatilePackages=
29-
shadow-utils
30-
systemd-boot
31-
32-
InitrdVolatilePackages=
33-
systemd
34-
udev
35-
3628
[Validation]
3729
# just for now, please do enable secureboot
3830
SecureBoot=no
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[Match]
2+
Distribution=fedora
3+
4+
[Content]
5+
Packages=systemd-container
6+
7+
VolatilePackages=
8+
shadow-utils
9+
systemd-boot
10+
11+
InitrdVolatilePackages=
12+
systemd
13+
udev

0 commit comments

Comments
 (0)