shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-05-27 21:05:55 +03:00
Code

mkosi: Unify initrd post-install scripts

Browse Source 
Just like we already have $SYSTEMD_PACKAGES for systemd packages to
re-install in the main image, let's add $INITRD_PACKAGES for all
systemd packages to re-install in the initrd.
This commit is contained in:
Daan De Meyer 2024-04-08 13:57:48 +02:00
parent e4c8e9dcbd
commit 1a2374a3f6
9 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst → mkosi.images/system/initrd/mkosi.postinst Executable file → Normal file
View File

@ -1,9 +1,10 @@
#!/bin/sh
#!/bin/bash
# SPDX-License-Identifier: LGPL-2.1-or-later
set -e
# shellcheck disable=SC2086
mkosi-install $INITRD_PACKAGES
# OpenSUSE insists on blacklisting erofs by default because its supposedly a legacy filesystem.
# See https://github.com/openSUSE/suse-module-tools/pull/71
rm -f "$BUILDROOT/usr/lib/modprobe.d/60-blacklist_fs-erofs.conf"
mkosi-install systemd udev systemd-experimental

3
mkosi.images/system/mkosi.conf
View File

@ -1,5 +1,8 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Config]
InitrdInclude=initrd/
[Output]
@Format=directory

5
mkosi.images/system/mkosi.conf.d/10-arch/initrd/mkosi.postinst
View File

@ -1,5 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: LGPL-2.1-or-later
set -e
mkosi-install systemd systemd-sysvcompat

4
mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
View File

@ -3,14 +3,12 @@
[Match]
Distribution=arch
[Config]
InitrdInclude=initrd/
# TODO: Switch to https://gitlab.archlinux.org/archlinux/packaging/packages/systemd once
# https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/merge_requests/8 is merged.
[Content]
Environment=
SYSTEMD_PACKAGES="systemd systemd-ukify systemd-sysvcompat systemd-resolvconf systemd-tests"
INITRD_PACKAGES="systemd systemd-sysvcompat"
Packages=
bpf

5
mkosi.images/system/mkosi.conf.d/10-centos-fedora/initrd/mkosi.postinst
View File

@ -1,5 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: LGPL-2.1-or-later
set -e
mkosi-install systemd systemd-udev

5
mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
View File

@ -4,9 +4,6 @@
Distribution=|centos
Distribution=|fedora
[Config]
InitrdInclude=initrd/
[Content]
Environment=
SYSTEMD_PACKAGES="systemd
@ -22,6 +19,8 @@ Environment=
systemd-oomd-defaults
systemd-journal-remote
systemd-networkd-defaults"
INITRD_PACKAGES="systemd systemd-udev"
Packages=
bpftool
cryptsetup

5
mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/initrd/mkosi.postinst
View File

@ -1,5 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: LGPL-2.1-or-later
set -e
mkosi-install systemd udev

4
mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
View File

@ -4,9 +4,6 @@
Distribution=|debian
Distribution=|ubuntu
[Config]
InitrdInclude=initrd/
[Content]
Environment=
SYSTEMD_PACKAGES="systemd
@ -23,6 +20,7 @@ Environment=
systemd-boot
systemd-ukify
udev"
INITRD_PACKAGES="systemd udev"
Packages=
^libasan[0-9]+$

4
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
View File

@ -3,9 +3,6 @@
[Match]
Distribution=opensuse
[Config]
InitrdInclude=initrd/
[Content]
Environment=
SYSTEMD_PACKAGES="systemd
@ -18,6 +15,7 @@ Environment=
systemd-portable
systemd-sysvcompat
systemd-testsuite"
INITRD_PACKAGES="systemd udev systemd-experimental"
# We install gawk, gzip, grep, xz, sed, rsync and docbook-xsl-stylesheets here explicitly so that the busybox
# versions don't get installed instead.