debian/changelog

+debian-edu-config (2.10.45) UNRELEASED; urgency=medium
+
+  * sbin/debian-edu-pxeinstall:
+    - Add code to enable the replacement of the stock Debian Installer logo with
+      the Debian Edu one in case the graphical installer has been chosen.
+    - Drop test builds related leftover cruft.
+  * share/debian-edu-config/tools/debian-edu-bless:
+    - Switch TESTINSTALL variable setting as test distributions are gone since
+      years, but a status report might still be useful; reword related comment.
+  * testsuite/doc:
+    - Use secure URL for wiki.debian.org.
+    - Adjust the FIXME: count code to report a proper number.
+  * debian/debian-edu-config.postinst
+    - Drop wpad-proxy-update for the main server (via ifup).
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Tue, 13 Nov 2018 13:56:32 +0100
+
 debian-edu-config (2.10.44) unstable; urgency=medium
 
   [ Wolfgang Schweer ]

debian/debian-edu-config.postinst

@@ -199,6 +199,11 @@ configure)
     # The scripts in /etc/network/if-up.d need to be executable.
     chmod +x /etc/network/if-up.d/hostname
     chmod +x /etc/network/if-up.d/wpad-proxy-update
+    # Drop wpad-proxy-update for the main server, it makes no sense to run the
+    # script at this time.
+    if egrep -q "(Main-Server)" /etc/debian-edu/config ; then
+        rm /etc/network/if-up.d/wpad-proxy-update
+    fi
 
     # silence dovecot's message: if you have trouble with authentication failures,
     # enable auth_debug setting. See http://wiki.dovecot.org/WhyDoesItNotWork

sbin/debian-edu-pxeinstall

@@ -72,13 +72,6 @@ if [ -f /etc/debian-edu/config ] ; then
     . /etc/debian-edu/config
 fi
 
-# Special case test builds
-if [ true = "$TESTINSTALL" ] ; then
-    edudist=$dist-test
-else
-    edudist=$dist
-fi
-
 # Allow site specific overrides to the variables
 if [ -f /etc/debian-edu/pxeinstall.conf ] ; then
     . /etc/debian-edu/pxeinstall.conf
@@ -171,6 +164,21 @@ for arch in $archs ; do
         if [ "$tarball" ] ; then
             tar --strip-components=2 -zxvf $tarball
         fi
+        if [ true = "$graphicdi" ]; then
+            # Replace Debian installer logo with Debian Edu one.
+            TMP=$(mktemp -d)
+            mkdir $TMP/$arch
+            cd $TMP/$arch
+            mkdir new
+            cd new
+            unmkinitramfs /var/lib/tftpboot/debian-installer/$arch/initrd.gz .
+            cp /usr/share/pixmaps/debian-edu-$dist-installer-logo.png usr/share/graphics/logo_debian.png
+            find . | cpio -H newc -o > ../initrd
+            cd ..
+            gzip initrd
+            cp initrd.gz /var/lib/tftpboot/debian-installer/$arch
+            rm -rf $TMP/$arch
+        fi
     )
 done
 
@@ -332,7 +340,7 @@ EOF
 
 ln -sf /usr/lib/PXELINUX/pxelinux.0 $tftpdir/pxelinux.0
 ln -sf /usr/lib/syslinux/modules/bios $tftpdir/syslinux
-ln -sf /usr/share/desktop-base/active-theme/grub/grub-4x3.png $tftpdir/debian-edu/debian-edu-pxe.png
+ln -sf /usr/share/pixmaps/debian-edu-$dist-syslinux.png $tftpdir/debian-edu/debian-edu-pxe.png
 
 defaultfile=$tftpdir/debian-edu/default-menu.cfg
 echo "Generating $defaultfile"

share/debian-edu-config/tools/debian-edu-bless

@@ -62,9 +62,8 @@ fi
 # during installation to the current version.
 VERSION="terra_alpha"
 
-# Set this if you want to run the testsuite after first boot, and use
-# the test version of the APT repositories.
-TESTINSTALL="true"
+# Replace false with true if you want to run the testsuite after first boot.
+TESTINSTALL="false"
 
 if [ 0 -ne $(id -u) ] ; then
     echo "error: this script need to run as root."

testsuite/doc

@@ -8,14 +8,14 @@ suite=$(lsb_release -sc)
 capsuite=$(echo $suite | sed 's/\([a-z]\)\([a-zA-Z0-9]*\)/\u\1\2/g')
 
 docfile=/usr/share/doc/debian-edu-doc/en/debian-edu-$suite-manual.html
-docurl=http://wiki.debian.org/DebianEdu/Documentation/$capsuite
+docurl=https://wiki.debian.org/DebianEdu/Documentation/$capsuite
 
 if [ -r $docfile ] ; then
-    fixmes=$(grep -c FIXME $docfile)
+    fixmes=$(grep -c FIXME: $docfile)
     if [ 0 -eq "$fixmes" ]; then
 	echo "success: $0: Release manual have zero FIXMEs."
     else
-	echo "error: $0: Release manual have $fixmes FIXMEs.  Please fix at $docurl ."
+	echo "error: $0: The manual for the $capsuite release has $fixmes FIXMEs.  Please fix at $docurl."
     fi
 else
     echo "error: $0: Unable to find documentation at $docfile."