diff --git a/katsu/modules/flagship/flagship-live.yaml b/katsu/modules/flagship/flagship-live.yaml index 9db8578..6898a50 100644 --- a/katsu/modules/flagship/flagship-live.yaml +++ b/katsu/modules/flagship/flagship-live.yaml @@ -3,6 +3,7 @@ builder: dnf import: - ../base/base.yaml - ../live/live.yaml + - ../live/readymade.yaml - flagship.yaml distro: Ultramarine Linux 41 (Flagship Edition) diff --git a/katsu/modules/gnome/gnome-live.sh b/katsu/modules/gnome/gnome-live.sh index 92bdd4f..a28cf4f 100644 --- a/katsu/modules/gnome/gnome-live.sh +++ b/katsu/modules/gnome/gnome-live.sh @@ -1,6 +1,6 @@ #!/bin/bash -x -sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys -sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome -sed -i 's/Fedora/Ultramarine/g' /usr/share/applications/org.fedoraproject.welcome-screen.desktop -sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/org.fedoraproject.welcome-screen.desktop +# sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys +# sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome +# sed -i 's/Fedora/Ultramarine/g' /usr/share/applications/org.fedoraproject.welcome-screen.desktop +# sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/org.fedoraproject.welcome-screen.desktop diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml index f42b5f9..c7718c9 100644 --- a/katsu/modules/gnome/gnome-live.yaml +++ b/katsu/modules/gnome/gnome-live.yaml @@ -3,6 +3,7 @@ builder: dnf import: - ../base/base.yaml - ../live/live.yaml + - ../live/readymade.yaml - gnome.yaml distro: Ultramarine GNOME 41 diff --git a/katsu/modules/live/anaconda.yaml b/katsu/modules/live/anaconda.yaml new file mode 100644 index 0000000..4b8326b --- /dev/null +++ b/katsu/modules/live/anaconda.yaml @@ -0,0 +1,8 @@ +dnf: + releasever: 41 + exec: dnf4 + packages: + - anaconda-dracut + - anaconda-live + - anaconda-install-env-deps + - "@anaconda-tools" diff --git a/katsu/modules/live/live.yaml b/katsu/modules/live/live.yaml index 9048980..be0ea19 100644 --- a/katsu/modules/live/live.yaml +++ b/katsu/modules/live/live.yaml @@ -22,10 +22,6 @@ dnf: - dracut-config-generic - dracut-network - dracut-squash - - anaconda-dracut - - anaconda-live - - anaconda-install-env-deps - - "@anaconda-tools" - libblockdev-nvdimm - isomd5sum - orca diff --git a/katsu/modules/live/readymade.yaml b/katsu/modules/live/readymade.yaml new file mode 100644 index 0000000..d5669e0 --- /dev/null +++ b/katsu/modules/live/readymade.yaml @@ -0,0 +1,5 @@ +dnf: + releasever: 41 + exec: dnf4 + packages: + - readymade diff --git a/katsu/modules/plasma/plasma-live.yaml b/katsu/modules/plasma/plasma-live.yaml index 28405dc..7514366 100644 --- a/katsu/modules/plasma/plasma-live.yaml +++ b/katsu/modules/plasma/plasma-live.yaml @@ -3,6 +3,7 @@ builder: dnf import: - ../base/base.yaml - ../live/live.yaml + - ../live/readymade.yaml - plasma.yaml distro: Ultramarine Linux 41 (Plasma Edition) diff --git a/katsu/modules/xfce/xfce-live.yaml b/katsu/modules/xfce/xfce-live.yaml index a1e3bc7..f8e1cda 100644 --- a/katsu/modules/xfce/xfce-live.yaml +++ b/katsu/modules/xfce/xfce-live.yaml @@ -3,6 +3,7 @@ builder: dnf import: - ../base/base.yaml - ../live/live.yaml + - ../live/readymade.yaml - xfce.yaml distro: Ultramarine Linux 41 (Xfce Edition)