[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Determine the Debian Edu artwork theme via the desktop-base active theme alternative

[Wolfgang Schweer]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
eab78f64 by Wolfgang Schweer at 2021-01-04T22:33:55+01:00
Determine the Debian Edu artwork theme via the desktop-base active theme alternative

This makes sbin/debian-edu-pxeinstall more robust and avoids to adjust the file
during development.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


2 changed files:

- debian/changelog
- sbin/debian-edu-pxeinstall


Changes:

=====================================
debian/changelog
=====================================
@@ -6,6 +6,9 @@ debian-edu-config (2.11.43) UNRELEASED; urgency=medium
   * share/debian-edu-config/tools/edu-icinga-setup:
     - Cope with recent mariadb-server package changes. Some leftover occurencies
       of 'mysql' have been replaced with 'mariadb'.
+  * sbin/debian-edu-pxeinstall:
+    - Determine the Debian Edu artwork theme via the desktop-base active theme
+      alternative instead of hardcoding it.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 03 Jan 2021 14:05:11 +0100
 


=====================================
sbin/debian-edu-pxeinstall
=====================================
@@ -64,6 +64,7 @@ fi
 [ "$mydesktop" ]  || mydesktop=xfce
 [ "$graphicdi" ]  || graphicdi=false
 [ "$dailydi" ]    || dailydi=false
+[ "$theme" ]      || theme="$(ls -L /etc/alternatives/desktop-theme/plymouth | grep script | cut -d'.' -f 1)"
 # Not hardcoded to allow PXE installation of a main-server without a
 # proxy set
 #[ "$http_proxy" ] || http_proxy=http://webcache:3128
@@ -181,10 +182,8 @@ for arch in $archs ; do
 			mkdir new
 			cd new
 			unmkinitramfs $tftpdir/debian-installer/$arch/initrd.gz .
-			if grep -q sid /etc/debian_version ; then
-				cp /usr/share/pixmaps/debian-edu-homeworld-installer-logo.png usr/share/graphics/logo_debian.png
-			else
-				cp /usr/share/pixmaps/debian-edu-$dist-installer-logo.png usr/share/graphics/logo_debian.png
+			if [ ! -z "$theme" ] ; then
+				cp /usr/share/pixmaps/$theme-installer-logo.png usr/share/graphics/logo_debian.png
 			fi
 			find . | cpio -H newc -o > ../initrd
 			cd ..
@@ -277,10 +276,8 @@ EOF
 	done
 ) > $menufile
 
-if grep -q sid /etc/debian_version ; then
-	cp /usr/share/pixmaps/debian-edu-homeworld-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png
-else
-	cp /usr/share/pixmaps/debian-edu-$dist-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png
+if [ ! -z "$theme" ] ; then
+	cp /usr/share/pixmaps/$theme-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png
 fi
 
 # Generate/modify the iPXE menu file



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/eab78f64ad2b0aed66114e91b1b3973684a32f6b

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/eab78f64ad2b0aed66114e91b1b3973684a32f6b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20210104/2996e89f/attachment-0001.html>