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.xml22
-rw-r--r--teams/eln/container.xml28
-rw-r--r--teams/eln/desktop-environments.xml49
-rw-r--r--teams/eln/liveprofiles.xml16
-rw-r--r--teams/eln/wsl.xml2
5 files changed, 28 insertions, 89 deletions
diff --git a/teams/eln/cloud.xml b/teams/eln/cloud.xml
index b146d48..2c71043 100644
--- a/teams/eln/cloud.xml
+++ b/teams/eln/cloud.xml
@@ -33,7 +33,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -48,7 +48,7 @@
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"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -63,7 +63,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" timeout="0"/>
@@ -78,7 +78,7 @@
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"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" timeout="0"/>
@@ -93,7 +93,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" timeout="0"/>
@@ -109,7 +109,7 @@
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"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" timeout="0"/>
@@ -125,7 +125,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -140,7 +140,7 @@
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"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -155,7 +155,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" firmware="ofw"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -170,7 +170,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="2000" bootfilesystem="xfs"
+ bootpartition="true" bootpartsize="1000" bootfilesystem="xfs"
rootfs_label="fedora"
>
<bootloader name="zipl" timeout="1"/>
@@ -199,7 +199,7 @@
</type>
</preferences>
<packages type="bootstrap" patternType="plusRecommended" profiles="CloudCore,CloudCoreUKI">
- <package name="fedora-eln-release"/>
+ <package name="fedora-release-eln"/>
</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 5eebfb4..c9ca883 100644
--- a/teams/eln/container.xml
+++ b/teams/eln/container.xml
@@ -18,9 +18,14 @@
<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"/>
+ <label name="org.opencontainers.image.license" value="MIT"/>
+ <label name="org.opencontainers.image.name" 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"/>
@@ -43,10 +48,15 @@
<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.license" value="MIT"/>
+ <label name="org.opencontainers.image.name" value="fedora-toolbox"/>
<label name="org.opencontainers.image.version" value="eln"/>
<label name="com.github.containers.toolbox" value="true"/>
+ <!-- Legacy attributes for backward compatibility -->
+ <label name="vendor" value="Fedora Project"/>
+ <label name="license" value="MIT"/>
+ <label name="name" value="fedora-toolbox"/>
+ <label name="version" value="eln"/>
</labels>
<environment>
<env name="container" value="oci"/>
@@ -77,7 +87,7 @@
<ignore name="grubby"/>
<ignore name="langpacks-en_GB"/>
<ignore name="sssd-client"/>
- <package name="fedora-eln-release"/>
+ <package name="fedora-release-eln"/>
<package name="bash"/>
<package name="coreutils"/>
<package name="rpm"/>
@@ -130,7 +140,7 @@
<package name="diffutils"/>
<package name="dnf5"/>
<package name="dnf5-plugins"/>
- <package name="fedora-eln-release"/>
+ <package name="fedora-release-eln"/>
<package name="file"/>
<package name="findutils"/>
<package name="flatpak-spawn"/>
@@ -196,10 +206,4 @@
<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
deleted file mode 100644
index c9741b0..0000000
--- a/teams/eln/desktop-environments.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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
deleted file mode 100644
index 05f7acb..0000000
--- a/teams/eln/liveprofiles.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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 051f8e6..6918bb3 100644
--- a/teams/eln/wsl.xml
+++ b/teams/eln/wsl.xml
@@ -14,7 +14,7 @@
<package name="coreutils"/>
<package name="dnf5"/>
<package name="dnf5-plugins"/>
- <package name="fedora-eln-release"/>
+ <package name="fedora-release-eln"/>
<package name="rpm"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="WSL-Base">
generated by cgitext v1.3.1+17 (git 2.54.0) at 2026-09-10 02:23:23 +0000