add cinnamon profile

This commit is contained in:
Leif Liddy 2022-12-26 01:05:19 +01:00 committed by ngompa
parent 1827c23a5f
commit a3c3a8137f
4 changed files with 16 additions and 4 deletions

View File

@ -8,6 +8,7 @@ This repository has multiple branches, one for each supported Fedora release. Th
* Minimal (image type: `oem`, image profiles: `Minimal`) * Minimal (image type: `oem`, image profiles: `Minimal`)
* Server (image type: `oem`, image profiles: `Server`) * Server (image type: `oem`, image profiles: `Server`)
* Workstation Cinnamon (image type: `oem`, image profiles: `Workstation-Cinnamon`)
* Workstation GNOME (image type: `oem`, image profiles: `Workstation-GNOME`) * Workstation GNOME (image type: `oem`, image profiles: `Workstation-GNOME`)
* Workstation KDE (image type: `oem`, image profiles: `Workstation-KDE`) * Workstation KDE (image type: `oem`, image profiles: `Workstation-KDE`)

View File

@ -3,6 +3,9 @@
<profile name="DesktopCommon" description="Common desktop packages"> <profile name="DesktopCommon" description="Common desktop packages">
<requires profile="Common"/> <requires profile="Common"/>
</profile> </profile>
<profile name="Cinnamon-Desktop" description="Cinnamon Desktop">
<requires profile="DesktopCommon"/>
</profile>
<profile name="GNOME-Desktop" description="GNOME Desktop"> <profile name="GNOME-Desktop" description="GNOME Desktop">
<requires profile="DesktopCommon"/> <requires profile="DesktopCommon"/>
</profile> </profile>
@ -24,19 +27,23 @@
<ignore name="@dial-up"/> <ignore name="@dial-up"/>
<ignore name="@guest-desktop-agents"/> <ignore name="@guest-desktop-agents"/>
</packages> </packages>
<packages type="image" patternType="plusRecommended" profiles="Cinnamon-Desktop">
<namedCollection name="cinnamon-desktop-environment"/>
<package name="fedora-release-cinnamon"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop"> <packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
<namedCollection name="workstation-product-environment"/> <namedCollection name="workstation-product-environment"/>
<package name="fedora-release-workstation"/> <package name="fedora-release-workstation"/>
</packages> </packages>
<packages type="image" patternType="plusRecommended" profiles="KDE-Desktop"> <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
<ignore name="@admin-tools"/>
<ignore name="gnome-disk-utility"/>
<ignore name="system-config-printer"/>
<namedCollection name="kde-desktop-environment"/> <namedCollection name="kde-desktop-environment"/>
<namedCollection name="kde-apps"/> <namedCollection name="kde-apps"/>
<namedCollection name="kde-media"/> <namedCollection name="kde-media"/>
<package name="fuse"/> <package name="fuse"/>
<package name="fedora-release-kde"/> <package name="fedora-release-kde"/>
<package name="kde-l10n"/> <package name="kde-l10n"/>
<ignore name="@admin-tools"/>
<ignore name="gnome-disk-utility"/>
<ignore name="system-config-printer"/>
</packages> </packages>
</image> </image>

View File

@ -71,7 +71,7 @@ touch /etc/reconfigSys
#====================================== #======================================
# Setup default target # Setup default target
#-------------------------------------- #--------------------------------------
if [[ "$kiwi_profiles" == *"GNOME"* ]] || [[ "$kiwi_profiles" == *"KDE"* ]]; then if [[ "$kiwi_profiles" == *"Cinnamon"* ]] || [[ "$kiwi_profiles" == *"GNOME"* ]] || [[ "$kiwi_profiles" == *"KDE"* ]]; then
systemctl set-default graphical.target systemctl set-default graphical.target
else else
systemctl set-default multi-user.target systemctl set-default multi-user.target

View File

@ -4,6 +4,10 @@
<requires profile="BootCore"/> <requires profile="BootCore"/>
<requires profile="DesktopCommon"/> <requires profile="DesktopCommon"/>
</profile> </profile>
<profile name="Workstation-Cinnamon" description="Workstation with Cinnamon Desktop">
<requires profile="WorkstationCommon"/>
<requires profile="Cinnamon-Desktop"/>
</profile>
<profile name="Workstation-GNOME" description="Workstation with GNOME Desktop"> <profile name="Workstation-GNOME" description="Workstation with GNOME Desktop">
<requires profile="WorkstationCommon"/> <requires profile="WorkstationCommon"/>
<requires profile="GNOME-Desktop"/> <requires profile="GNOME-Desktop"/>