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

[pere at alioth.debian.org]

Author: pere
Date: 2017-01-27 22:28:59 +0000 (Fri, 27 Jan 2017)
New Revision: 88283

Modified:
   trunk/src/build/CD-administrator/CONF-stretch-amd64-i386-netinst.sh
   trunk/src/build/CD-administrator/CONF-stretch-usbstick.sh
Log:
Hardcode stretch codename and build usbstick more like the jessie usbstick.

Modified: trunk/src/build/CD-administrator/CONF-stretch-amd64-i386-netinst.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-stretch-amd64-i386-netinst.sh	2017-01-27 18:40:04 UTC (rev 88282)
+++ trunk/src/build/CD-administrator/CONF-stretch-amd64-i386-netinst.sh	2017-01-27 22:28:59 UTC (rev 88283)
@@ -58,8 +58,8 @@
 export BASEDIR=`pwd`
 export TOPDIR=/skolelinux/administrator
 
-# Building testing cd set ...
-export CODENAME=$(wget -q -O - http://ftp.skolelinux.org/debian/dists/testing/Release | grep '^Codename' | cut -d" " -f2)
+# Building Stretch cd set ...
+export CODENAME=stretch
 
 # By default use Debian installer packages from $CODENAME
 if [ -z "$DI_CODENAME" ]; then

Modified: trunk/src/build/CD-administrator/CONF-stretch-usbstick.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-stretch-usbstick.sh	2017-01-27 18:40:04 UTC (rev 88282)
+++ trunk/src/build/CD-administrator/CONF-stretch-usbstick.sh	2017-01-27 22:28:59 UTC (rev 88283)
@@ -60,7 +60,7 @@
 export TOPDIR=/skolelinux/administrator
 
 # Building testing cd set ...
-export CODENAME=$(wget -q -O - http://ftp.skolelinux.org/debian/dists/testing/Release | grep '^Codename' | cut -d" " -f2)
+export CODENAME=stretch
 
 # By default use Debian installer packages from $CODENAME
 if [ -z "$DI_CODENAME" ]; then
@@ -159,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:
@@ -334,9 +334,9 @@
 # INSTALLER_CD=0: nothing special (default)
 # INSTALLER_CD=1: just add debian-installer (use TASK=debian-installer)
 # INSTALLER_CD=2: add d-i and base (use TASK=debian-installer+kernel)
-export INSTALLER_CD=0
+export INSTALLER_CD=2
 export TASK=Debian-edu-netinst
-export COMPLETE=1
+export COMPLETE=0
 
 # Parameters to pass to kernel (or d-i) when the CD boots. Not currently
 # supported for all architectures.