From dfb2a9c1f788d52376d43e53f2027918effb465f Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 9 Jul 2022 13:39:39 +0200
Subject: [PATCH] livecd, livedvd: packages lists updates and script fixes

---
 platforms/livecd-root/Makefile  |  6 ++----
 platforms/livedvd-root/Makefile | 18 ++++++++---------
 platforms/livedvd/post.inc.sh   | 34 ++++++++++++++++-----------------
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile
index 8e770da..b6bbb78 100644
--- a/platforms/livecd-root/Makefile
+++ b/platforms/livecd-root/Makefile
@@ -11,10 +11,8 @@ $(MAKEDIST_TARGET)-livecd-root: \
                   ttf-freefont liberation-fonts-ttf \
                   partitionmanager ntfs-3g libdvdcss \
                   NetworkManager ModemManager \
-                  firefox vixie-cron logrotate \
-                  livecd-tools \
-                  Mesa-tools driconf parted testdisk \
-                  samba-server sddm \
+                  firefox livecd-tools \
+                  parted samba-server sddm \
                   mambatray dnf \
                   $(MAKEDIST_TARGET)-livecd-kde
 
diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile
index ecfa72d..cf6a027 100644
--- a/platforms/livedvd-root/Makefile
+++ b/platforms/livedvd-root/Makefile
@@ -1,6 +1,6 @@
 $(MAKEDIST_TARGET)-livedvd-kde: desktop-base-kde krfb ark kcalc kdf kgpg \
                        spectacle okular kontact kmail akregator \
-                       kopete bluedevil5 smb4k amarok kwalletmanager dragon kate
+                       kopete bluedevil5 smb4k kwalletmanager dragon kate
 $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
 
 $(MAKEDIST_TARGET)-livedvd-root: \
@@ -10,20 +10,20 @@ $(MAKEDIST_TARGET)-livedvd-root: \
                   xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   partitionmanager ntfs-3g libdvdcss \
-                  firefox kpartsplugin vixie-cron logrotate \
+                  firefox kpartsplugin \
                   macbook-tools livecd-tools gdb \
-                  Mesa-tools driconf parted testdisk samba-server \
+                  parted samba-server \
                   mambatray sddm \
-                  $(MAKEDIST_TARGET)-livedvd-kde testdisk photorec
+                  $(MAKEDIST_TARGET)-livedvd-kde
 
 $(MAKEDIST_TARGET)-livedvd-root-x86_64: VirtualBox-guest
 
 # Localization targets
-$(MAKEDIST_TARGET)-livedvd-root-de: langpacks-de firefox-langpack-de
-$(MAKEDIST_TARGET)-livedvd-root-en: langpacks-en_GB
-$(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es firefox-langpack-es-ES
-$(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr firefox-langpack-fr
-$(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it firefox-langpack-it
+$(MAKEDIST_TARGET)-livedvd-root-de: langpacks-de firefox-langpack-de libreoffice-langpack-de
+$(MAKEDIST_TARGET)-livedvd-root-en: langpacks-en_GB libreoffice-langpack-en_GB
+$(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es firefox-langpack-es-ES libreoffice-langpack-es
+$(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr firefox-langpack-fr libreoffice-langpack-fr
+$(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it firefox-langpack-it libreoffice-langpack-it
 # FIXME: add kdepim
 syslog-ng:
 	@echo
diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh
index a94c504..583d8ef 100644
--- a/platforms/livedvd/post.inc.sh
+++ b/platforms/livedvd/post.inc.sh
@@ -70,9 +70,9 @@ for l in $MULTILANGUAGE; do
 submenu "${LABEL}" {
 _EOF
 
-ISOID=
-for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
-   cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
+   ISOID=
+   for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
+      cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
 menuentry "openmamba GNU/Linux (${KERNEL_MAJVER}${K} - ${l})" {
     echo "Loading /boot/vmlinuz${ISOID}"
     linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} selinux=0 quiet splash ro locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
@@ -80,8 +80,8 @@ menuentry "openmamba GNU/Linux (${KERNEL_MAJVER}${K} - ${l})" {
     initrd /boot/initrd${ISOID}.gz
 }
 _EOF
-   ISOID=$(($ISOID + 1))
-done
+      ISOID=$(($ISOID + 1))
+   done
 
    cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
 submenu "Advanced options for openmamba GNU/Linux" {
@@ -100,9 +100,9 @@ _EOF
 #   ISOID=$(($ISOID + 1))
 #done
 
-ISOID=
-for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
-   cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
+   ISOID=
+   for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
+      cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
 	menuentry "Debug mode (${KERNEL_MAJVER}${K} - ${l})" {
 		echo "Loading /boot/vmlinuz${ISOID}"
 		linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
@@ -110,11 +110,11 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
 		initrd /boot/initrd${ISOID}.gz
 	}
 _EOF
-   ISOID=$(($ISOID + 1))
-done
-ISOID=
-for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
-   cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
+      ISOID=$(($ISOID + 1))
+   done
+   ISOID=
+   for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
+      cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
 	menuentry "Debug mode with nomodeset (${KERNEL_MAJVER}${K} - ${l})" {
 		echo "Loading /boot/vmlinuz${ISOID}"
 		linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug nomodeset locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
@@ -122,14 +122,14 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
 		initrd /boot/initrd${ISOID}.gz
 	}
 _EOF
-   ISOID=$(($ISOID + 1))
-done
+      ISOID=$(($ISOID + 1))
+   done
 
-cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
+   cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
 }
 }
 _EOF
-
+done
 
 # configure isolinux boot loader (obsolete)
 cat > $MOUNTDIR2/boot/isolinux/isolinux.cfg.utf8 << _EOF