aboutsummaryrefslogtreecommitdiff
path: root/teams/eln
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'teams/eln')
-rw-r--r--teams/eln/cloud.xml83
-rw-r--r--teams/eln/container.xml141
-rw-r--r--teams/eln/desktop-environments.xml49
-rw-r--r--teams/eln/liveprofiles.xml16
-rw-r--r--teams/eln/wsl.xml7
5 files changed, 273 insertions, 23 deletions
diff --git a/teams/eln/cloud.xml b/teams/eln/cloud.xml
index 090b7b5..b146d48 100644
--- a/teams/eln/cloud.xml
+++ b/teams/eln/cloud.xml
@@ -28,12 +28,12 @@
<requires profile="Cloud-Base-Generic"/>
</profile>
</profiles>
- <preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-Azure" arch="x86_64">
<type image="oem" format="vhd-fixed" formatoptions="force_size"
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -43,12 +43,27 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-Azure" arch="aarch64">
+ <type image="oem" format="vhd-fixed" formatoptions="force_size"
+ filesystem="xfs"
+ kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off"
+ devicepersistency="by-uuid"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ rootfs_label="fedora"
+ >
+ <bootloader name="grub2" bls="true" console="serial" timeout="0"/>
+ <size unit="G">5</size>
+ <oemconfig>
+ <oem-resize>false</oem-resize>
+ </oemconfig>
+ </type>
+ </preferences>
+ <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64">
<type image="oem"
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" timeout="0"/>
@@ -58,12 +73,27 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-AmazonEC2" arch="aarch64">
+ <type image="oem"
+ filesystem="xfs"
+ kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
+ devicepersistency="by-uuid"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ rootfs_label="fedora"
+ >
+ <bootloader name="grub2" bls="true" timeout="0"/>
+ <size unit="G">5</size>
+ <oemconfig>
+ <oem-resize>false</oem-resize>
+ </oemconfig>
+ </type>
+ </preferences>
+ <preferences profiles="Cloud-Base-GCE" arch="x86_64">
<type image="oem" format="gce"
filesystem="xfs"
kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" timeout="0"/>
@@ -74,12 +104,43 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-GCE" arch="aarch64">
+ <type image="oem" format="gce"
+ filesystem="xfs"
+ kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off"
+ devicepersistency="by-uuid"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ rootfs_label="fedora"
+ >
+ <bootloader name="grub2" bls="true" timeout="0"/>
+ <!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G -->
+ <size unit="G">10</size>
+ <oemconfig>
+ <oem-resize>false</oem-resize>
+ </oemconfig>
+ </type>
+ </preferences>
+ <preferences profiles="Cloud-Base-Generic" arch="x86_64">
<type image="oem" format="qcow2"
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ rootfs_label="fedora"
+ >
+ <bootloader name="grub2" bls="true" console="serial" timeout="0"/>
+ <size unit="G">5</size>
+ <oemconfig>
+ <oem-resize>false</oem-resize>
+ </oemconfig>
+ </type>
+ </preferences>
+ <preferences profiles="Cloud-Base-Generic" arch="aarch64">
+ <type image="oem" format="qcow2"
+ filesystem="xfs"
+ kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
+ devicepersistency="by-uuid"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -94,7 +155,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" firmware="ofw"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -109,7 +170,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="xfs"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="xfs"
rootfs_label="fedora"
>
<bootloader name="zipl" timeout="1"/>
@@ -138,7 +199,7 @@
</type>
</preferences>
<packages type="bootstrap" patternType="plusRecommended" profiles="CloudCore,CloudCoreUKI">
- <package name="fedora-release-eln"/>
+ <package name="fedora-eln-release"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="CloudCore">
<namedCollection name="cloud-server-environment"/>
diff --git a/teams/eln/container.xml b/teams/eln/container.xml
index ec934d1..5eebfb4 100644
--- a/teams/eln/container.xml
+++ b/teams/eln/container.xml
@@ -5,6 +5,7 @@
<profile name="Container-Base-Generic" description="Generic Base Container Image">
<requires profile="ContainerCore"/>
</profile>
+ <profile name="Container-Toolbox" description="Toolbox Container Image"/>
</profiles>
<preferences profiles="Container-Base-Generic">
<type image="oci">
@@ -17,14 +18,9 @@
<labels>
<label name="org.opencontainers.image.vendor" value="Fedora Project"/>
<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
- <label name="org.opencontainers.image.license" value="MIT"/>
- <label name="org.opencontainers.image.name" value="fedora"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora"/>
<label name="org.opencontainers.image.version" value="eln"/>
- <!-- Legacy attributes for backward compatibility -->
- <label name="vendor" value="Fedora Project"/>
- <label name="license" value="MIT"/>
- <label name="name" value="fedora"/>
- <label name="version" value="eln"/>
</labels>
<environment>
<env name="container" value="oci"/>
@@ -36,6 +32,33 @@
<rpm-locale-filtering>true</rpm-locale-filtering>
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
+ <preferences profiles="Container-Toolbox">
+ <type image="oci">
+ <containerconfig
+ name="fedora-toolbox"
+ tag="eln"
+ maintainer="Fedora Project Contributors &lt;devel@lists.fedoraproject.org&gt;"
+ >
+ <subcommand execute="/bin/bash"/>
+ <labels>
+ <label name="org.opencontainers.image.vendor" value="Fedora Project"/>
+ <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora-toolbox"/>
+ <label name="org.opencontainers.image.version" value="eln"/>
+ <label name="com.github.containers.toolbox" value="true"/>
+ </labels>
+ <environment>
+ <env name="container" value="oci"/>
+ <env name="PATH" value="/usr/local/bin:/usr/bin"/>
+ </environment>
+ </containerconfig>
+ </type>
+ <timezone>Etc/UTC</timezone>
+ <locale>en_US</locale>
+ <rpm-locale-filtering>false</rpm-locale-filtering>
+ <rpm-excludedocs>false</rpm-excludedocs>
+ </preferences>
<packages type="bootstrap" profiles="ContainerCore">
<ignore name="dosfstools"/>
<ignore name="e2fsprogs"/>
@@ -54,7 +77,7 @@
<ignore name="grubby"/>
<ignore name="langpacks-en_GB"/>
<ignore name="sssd-client"/>
- <package name="fedora-release-eln"/>
+ <package name="fedora-eln-release"/>
<package name="bash"/>
<package name="coreutils"/>
<package name="rpm"/>
@@ -77,4 +100,106 @@
<package name="xz"/>
<package name="zstd"/>
</packages>
+ <packages type="bootstrap" patternType="plusRecommended" profiles="Container-Toolbox">
+ <ignore name="dosfstools"/>
+ <ignore name="e2fsprogs"/>
+ <ignore name="*-firmware"/>
+ <ignore name="fuse-libs"/>
+ <ignore name="geolite2-city"/>
+ <ignore name="geolite2-country"/>
+ <ignore name="grubby"/>
+ <ignore name="kernel"/>
+ <ignore name="libss"/> <!-- used by e2fsprogs -->
+ <ignore name="pinentry"/>
+ <ignore name="shared-mime-info"/>
+ <ignore name="sssd-client"/>
+ <!-- This is a weak dep of systemd, we do not want this in the container;
+ see: https://github.com/containers/toolbox/issues/1410 -->
+ <ignore name="systemd-resolved"/>
+ <ignore name="trousers"/>
+ <ignore name="xkeyboard-config"/>
+ <package name="acl"/>
+ <package name="bash"/>
+ <package name="bash-completion"/>
+ <package name="bc"/>
+ <package name="bzip2"/>
+ <package name="coreutils"/>
+ <package name="coreutils-common"/>
+ <package name="cpio"/>
+ <package name="curl"/>
+ <package name="diffutils"/>
+ <package name="dnf5"/>
+ <package name="dnf5-plugins"/>
+ <package name="fedora-eln-release"/>
+ <package name="file"/>
+ <package name="findutils"/>
+ <package name="flatpak-spawn"/>
+ <package name="gawk"/>
+ <package name="git"/>
+ <package name="glibc-all-langpacks"/>
+ <package name="gnupg2"/>
+ <package name="gnupg2-smime"/>
+ <package name="grep"/>
+ <package name="gvfs-client"/>
+ <package name="gzip"/>
+ <package name="hostname"/>
+ <package name="iproute"/>
+ <package name="iputils"/>
+ <package name="kbd-misc"/>
+ <package name="keyutils"/>
+ <package name="krb5-libs"/>
+ <package name="langpacks-en"/>
+ <package name="less"/>
+ <package name="libcap"/>
+ <package name="lsof"/>
+ <package name="man-db"/>
+ <package name="man-pages"/>
+ <package name="mesa-dri-drivers"/>
+ <package name="mesa-vulkan-drivers" arch="x86_64"/>
+ <package name="mtr"/>
+ <package name="openssh-clients"/>
+ <package name="openssl"/>
+ <package name="pam"/>
+ <package name="pigz"/>
+ <package name="policycoreutils"/>
+ <package name="procps-ng"/>
+ <package name="psmisc"/>
+ <package name="python3"/>
+ <package name="rootfiles"/>
+ <package name="rpm"/>
+ <package name="rsync"/>
+ <package name="sed"/>
+ <package name="shadow-utils"/>
+ <package name="sudo"/>
+ <package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 -->
+ <package name="tcpdump"/>
+ <package name="time"/>
+ <package name="traceroute"/>
+ <package name="tree"/>
+ <package name="tzdata"/>
+ <package name="unzip"/>
+ <package name="util-linux"/>
+ <package name="vim-minimal"/>
+ <package name="vte-profile"/>
+ <package name="vulkan-loader"/>
+ <package name="wget"/>
+ <package name="which"/>
+ <package name="whois"/>
+ <package name="words"/>
+ <package name="xorg-x11-xauth"/>
+ <package name="xz"/>
+ <package name="zip"/>
+ </packages>
+ <packages type="uninstall" profiles="Container-Toolbox">
+ <package name="dracut"/>
+ <package name="pinentry"/>
+ <package name="systemd-resolved"/>
+ <package name="xkeyboard-config"/>
+ </packages>
+ <packages type="bootstrap" profiles="Container-Base-Generic,Container-Toolbox">
+ <package name="systemd-standalone-tmpfiles"/>
+ </packages>
+ <packages type="uninstall" profiles="Container-Base-Generic,Container-Toolbox">
+ <package name="systemd-standalone-tmpfiles"/>
+ </packages>
</image>
diff --git a/teams/eln/desktop-environments.xml b/teams/eln/desktop-environments.xml
new file mode 100644
index 0000000..c9741b0
--- /dev/null
+++ b/teams/eln/desktop-environments.xml
@@ -0,0 +1,49 @@
+<image>
+ <profiles>
+ <profile name="DesktopCommon" description="Common desktop packages"/>
+ <profile name="GNOME-Desktop" description="GNOME Desktop">
+ <requires profile="DesktopCommon"/>
+ </profile>
+ <profile name="KDE-Desktop" description="KDE Plasma Desktop">
+ <requires profile="DesktopCommon"/>
+ </profile>
+ <profile name="COSMIC-Desktop" description="COSMIC Desktop">
+ <requires profile="DesktopCommon"/>
+ </profile>
+ </profiles>
+ <packages type="image" patternType="plusRecommended" profiles="DesktopCommon">
+ <package name="fedora-eln-backgrounds"/>
+ <package name="firefox"/>
+ <package name="plymouth-theme-spinner"/>
+ <namedCollection name="base-graphical"/>
+ <namedCollection name="core"/>
+ <namedCollection name="fonts"/>
+ <namedCollection name="guest-desktop-agents"/>
+ <namedCollection name="hardware-support"/>
+ <namedCollection name="multimedia"/>
+ <namedCollection name="networkmanager-submodules"/>
+ <namedCollection name="print-client"/>
+ <namedCollection name="standard"/>
+ <ignore name="insights-client"/>
+ <ignore name="libdnf-plugin-subscription-manager"/>
+ <ignore name="subscription-manager"/>
+ <ignore name="subscription-manager-cockpit"/>
+ </packages>
+ <packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
+ <namedCollection name="gnome-desktop"/>
+ <namedCollection name="workstation-product"/>
+ <package name="gnome-classic-session"/>
+ </packages>
+ <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
+ <namedCollection name="kde-desktop-environment"/>
+ <namedCollection name="kde-apps"/>
+ <namedCollection name="kde-media"/>
+ <ignore name="initial-setup"/> <!-- redundant with plasma-setup -->
+ <ignore name="plasma-nm-l2tp"/>
+ <ignore name="plasma-nm-vpnc"/>
+ <package name="fuse"/>
+ </packages>
+ <packages type="image" patternType="plusRecommended" profiles="COSMIC-Desktop">
+ <namedCollection name="cosmic-desktop-environment"/>
+ </packages>
+</image>
diff --git a/teams/eln/liveprofiles.xml b/teams/eln/liveprofiles.xml
new file mode 100644
index 0000000..05f7acb
--- /dev/null
+++ b/teams/eln/liveprofiles.xml
@@ -0,0 +1,16 @@
+<image>
+ <profiles>
+ <profile name="GNOME-Live" description="GNOME Live DVD">
+ <requires profile="GNOME-Desktop"/>
+ <requires profile="LiveInstall"/>
+ </profile>
+ <profile name="KDE-Live" description="KDE Plasma Live DVD">
+ <requires profile="KDE-Desktop"/>
+ <requires profile="LiveInstall"/>
+ </profile>
+ <profile name="COSMIC-Live" description="COSMIC Live DVD">
+ <requires profile="COSMIC-Desktop"/>
+ <requires profile="LiveInstall"/>
+ </profile>
+ </profiles>
+</image>
diff --git a/teams/eln/wsl.xml b/teams/eln/wsl.xml
index c1c4beb..051f8e6 100644
--- a/teams/eln/wsl.xml
+++ b/teams/eln/wsl.xml
@@ -3,7 +3,7 @@
<profile name="WSL-Base" description="Windows Subsystem for Linux Base"/>
</profiles>
<preferences profiles="WSL-Base">
- <type image="tbz"/>
+ <type image="wsl"/>
<timezone>Etc/UTC</timezone>
<locale>en_US</locale>
<rpm-locale-filtering>false</rpm-locale-filtering>
@@ -14,10 +14,8 @@
<package name="coreutils"/>
<package name="dnf5"/>
<package name="dnf5-plugins"/>
- <package name="fedora-release-eln"/>
- <package name="policycoreutils"/>
+ <package name="fedora-eln-release"/>
<package name="rpm"/>
- <package name="selinux-policy-targeted"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="WSL-Base">
<package name="attr"/>
@@ -61,6 +59,7 @@
<package name="wget"/>
<package name="which"/>
<package name="whois"/>
+ <package name="wsl-setup"/>
<package name="zip"/>
</packages>
</image>
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 23:41:51 +0000