Copy more example config from the setup repo

contrib/HEADER.html.in

@@ -83,6 +83,8 @@ cpp.
      writeable DVD media
 #  elif TYPEbd
      writeable Blu-Ray media
+#  elif TYPE16G
+     16GB USB media
 #  elif TYPEdlbd
      writeable dual-layer Blu-Ray media
 #  endif
@@ -202,14 +204,11 @@ cpp.
       
 #  if defined(TYPEbd) && !defined(ARCHsource) && !defined(STYLElist)
 
-     <p>The <code>BD</code> image here is a special large image that
-     contains the core Debian installer code and a specific set of
-     programs. Depending on the purpose you'll also need an Internet
-     connection.</p>
-
 #    if defined(ARCHi386)
 
-       <p>The <code>edu-usb</code> BD here is a special version of
+       <h2>What is an edu BD image?</h2>
+
+       <p>The <code>edu</code> BD here is a special version of
        the BD image that is targeted specifically at 32-bit Intel machines.
        It provides a menu to install the Debian Edu Pure Blend without the
        need of an Internet connection. See the
@@ -220,7 +219,9 @@ cpp.
 
 #    if defined(ARCHamd64)
 
-       <p>The <code>edu-usb</code> BD here is a special version of
+       <h2>What is an edu BD image?</h2>
+
+       <p>The <code>edu</code> BD here is a special version of
        the BD image that is targeted specifically at 64-bit Intel machines.
        It provides a menu to install the Debian Edu Pure Blend without the
        need of an Internet connection. See the

contrib/ftp.cron

@@ -88,7 +88,7 @@ if [ -f "$TRACE" ] ; then
 		    echo "Triggered by mirror pulse:"
 		    cat "$TRACE"
 		fi
-                $TOPDIR/cronjob.daily
+                $TOPDIR/cronjob.daily 2>&1 | tee ~/build/log/cronjob.daily-$DATE-$BUILDNUM.log
                 cp "$MYCOPY" "$MYCOPY".lastbuild
                 if ! /usr/bin/cmp -s "$MYCOPY".lastbuild "$TRACE" ; then
                     mail_list "testingcds has detected a pulse while we were building dailies"
@@ -101,7 +101,7 @@ if [ -f "$TRACE" ] ; then
                     echo "BAILING OUT OF WEEKLY BUILD"
                     mail_list "$HOSTNAME BAILING OUT OF WEEKLY BUILD"
                 else
-                    $TOPDIR/cronjob.weekly
+                    $TOPDIR/cronjob.weekly 2>&1 | tee ~/build/log/cronjob.weekly-$DATE.log
 		    BUILD_DONE=1
                 fi
             fi

contrib/iso_run

@@ -30,7 +30,7 @@ copy_files() {
     TARGET=$2
     ARCHES=$3
 
-    DISKTYPES="cd dvd bd dlbd"
+    DISKTYPES="cd dvd bd dlbd 16G"
     DIRTYPES="iso jigdo list"
 
     # Only make torrent files and dirs for release builds

contrib/testingcds

@@ -81,6 +81,9 @@ case "$INSTALLER_CD" in
         export DISKTYPE=DLBD;;
     E)
         export DISKTYPE=gnome-CD;;
+    M|N)
+        export OUT_TYPE=16G
+        export DISKTYPE=STICK16GB;;
     *)  export DISKTYPE=CD;;
 esac
 
@@ -144,6 +147,10 @@ elif [ "$INSTALLER_CD" = "K" ]; then
     export OFFICIAL="Debian-Edu Full USB image"
 elif [ "$INSTALLER_CD" = "L" ]; then
     export OFFICIAL="Unofficial Debian-Edu Full USB image including firmware"
+elif [ "$INSTALLER_CD" = "M" ]; then
+    export OFFICIAL="Official 16G USB image"
+elif [ "$INSTALLER_CD" = "N" ]; then
+    export OFFICIAL="Unofficial 16G USB image including firmware"
 fi
 
 rm -rf "$OUT"