diff options
Diffstat (limited to 'mkosi.conf.d')
| -rw-r--r-- | mkosi.conf.d/10-arch/mkosi.conf | 4 | ||||
| -rw-r--r-- | mkosi.conf.d/10-centos-fedora/mkosi.conf | 4 | ||||
| -rw-r--r-- | mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf | 13 | ||||
| -rw-r--r-- | mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 4 | ||||
| -rw-r--r-- | mkosi.conf.d/10-opensuse/mkosi.conf | 5 |
5 files changed, 13 insertions, 17 deletions
diff --git a/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.conf.d/10-arch/mkosi.conf index 96ae8c88b1..d9f75c65d3 100644 --- a/mkosi.conf.d/10-arch/mkosi.conf +++ b/mkosi.conf.d/10-arch/mkosi.conf @@ -37,8 +37,8 @@ Packages= linux man-db multipath-tools + nmap open-iscsi - openbsd-netcat openssh openssl pacman @@ -54,7 +54,7 @@ Packages= shadow softhsm squashfs-tools - stress + stress-ng tgt tpm2-tools tpm2-tss diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.conf.d/10-centos-fedora/mkosi.conf index f200409d6f..4c6109a544 100644 --- a/mkosi.conf.d/10-centos-fedora/mkosi.conf +++ b/mkosi.conf.d/10-centos-fedora/mkosi.conf @@ -45,7 +45,7 @@ Packages= libcap-ng-utils libubsan man-db - netcat + nmap-ncat openssh-clients openssh-server pam @@ -62,7 +62,7 @@ Packages= sbsigntools softhsm squashfs-tools - stress + stress-ng tpm2-tools util-linux veritysetup diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf b/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf index 9fe5509695..0a388f3c08 100644 --- a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf +++ b/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf @@ -1,20 +1,13 @@ # SPDX-License-Identifier: LGPL-2.1-or-later +# libselinux does not work in the slightest with /usr-only images so don't install the packages if we're +# building a /usr-only image. + [Match] Profile=!particle [Content] -# libselinux does not work in the slightest with /usr-only images so don't install the packages if we're -# building a /usr-only image. Packages= selinux-policy selinux-policy-targeted setools-console - -# We relabel on first boot instead of at build time because it is only possible to label without root -# if the labels exist in the host system, and we want to be able to cross-build to other distributions. -SELinuxRelabel=no - -InitrdPackages= - selinux-policy - selinux-policy-targeted diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf index 5f9e3843e3..07bf95cee7 100644 --- a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf +++ b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf @@ -65,7 +65,7 @@ Packages= locales man-db multipath-tools - netcat-openbsd + ncat open-iscsi openssh-client openssh-server @@ -78,7 +78,7 @@ Packages= quota softhsm2 squashfs-tools - stress + stress-ng tgt tpm2-tools tzdata diff --git a/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.conf.d/10-opensuse/mkosi.conf index c5a014f70b..7be269fbb8 100644 --- a/mkosi.conf.d/10-opensuse/mkosi.conf +++ b/mkosi.conf.d/10-opensuse/mkosi.conf @@ -8,13 +8,14 @@ InitrdInclude=initrd/ [Distribution] Release=tumbleweed +Repositories=non-oss PackageManagerTrees=macros.db_backend:/etc/rpm/macros.db_backend [Content] Environment= GIT_URL=https://src.opensuse.org/rpm/systemd GIT_BRANCH=devel - GIT_COMMIT=23bfa9d83b6e24a5395a704b816a351f3dc5b5316e580cacedd1b5d9e068c117 + GIT_COMMIT=8c025c3bdf03539682aafb73d7950324f00cacac51a74d22dd3c5c8ead6fef02 VolatilePackages= systemd @@ -60,6 +61,7 @@ Packages= libkmod2 libubsan1 multipath-tools + ncat open-iscsi openssh-clients openssh-server @@ -79,6 +81,7 @@ Packages= shadow softhsm squashfs + stress-ng tgt timezone tpm2.0-tools |