[debian-edu-commits] r88252 - trunk/src/build/CD-administrator

[holger at alioth.debian.org]

Author: holger
Date: 2017-01-23 21:23:46 +0000 (Mon, 23 Jan 2017)
New Revision: 88252

Modified:
   trunk/src/build/CD-administrator/CONF-edu-testing-nolocal-dvd.sh
Log:
adopt changes for Stretch based on the netinst image

Modified: trunk/src/build/CD-administrator/CONF-edu-testing-nolocal-dvd.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-edu-testing-nolocal-dvd.sh	2017-01-23 21:23:26 UTC (rev 88251)
+++ trunk/src/build/CD-administrator/CONF-edu-testing-nolocal-dvd.sh	2017-01-23 21:23:46 UTC (rev 88252)
@@ -52,6 +52,7 @@
 unset SUITE              || true
 unset LOGOPNG		|| true
 unset EXTRA_DISK_IMAGES         || true
+unset FORCE_SID_TASKSEL || true
 
 # The debian-cd dir
 # Where I am (hoping I'm in the debian-cd dir)
@@ -70,9 +71,13 @@
 # This may be an url, or "default", which will make it use the default url
 # for the daily d-i builds. If not set, uses the official d-i images from
 # the Debian mirror.
-# Unset since 5/3-2010 experimental daily builds have 2.6.32, testing have 2.6.30
-#export DI_WWW_HOME=default
+export DI_WWW_HOME=default
 
+# Use old DI_CODENAME since 2013-05-18 while the d-i images for jessie
+# are missing
+# Use sid since 2014-10-24 to test the latest udebs early
+#export DI_CODENAME=sid
+
 # Version number, "2.2 r0", "2.2 r1" etc.
 export DEBVERSION="9+edu0~a0"
 
@@ -154,7 +159,7 @@
 
 # Where to find the security patches.  This directory should be the
 # top directory of a security.debian.org mirror.
-export SECURITY="$TOPDIR"/debmirror/debian/debian-security
+#export SECURITY="$TOPDIR"/debmirror/debian/debian-security
 
 # Include proposed updates
 # Note that on the CDs it will not be visible where packages came from:
@@ -344,7 +349,7 @@
 export MAXCDS=1
 
 # If set, overrides the boot picture used.
-export SPLASHPNG="$BASEDIR/../splash-skolelinux-wheezy.png"
+export SPLASHPNG="$BASEDIR/../splash-skolelinux-stretch.png"
 
 # Set to 1 to save space by omitting the installation manual. 
 # If so the README will link to the manual on the web site.
@@ -374,6 +379,11 @@
 	;;
 esac
 
+# Add options to wget to include support for the Debian CA, so
+# https://d-i.debian.org et al will work.  Not needed on Jessie.
+#export WGET_OPTS="--ca-directory /etc/ssl/certs/"
+export WGET="wget $WGET_OPTS"
+
 # Set this to force the Release file(s) to say "stable". Used in first
 # Etch builds to allow us to build before the archive updated
 #EARLY_BUILD_HACK=1