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

[holger at alioth.debian.org]

Author: holger
Date: 2017-01-25 19:35:01 +0000 (Wed, 25 Jan 2017)
New Revision: 88265

Added:
   trunk/src/build/CD-administrator/debian-cd.patch.stretch
Log:
provide patch for stretch

Copied: trunk/src/build/CD-administrator/debian-cd.patch.stretch (from rev 88260, trunk/src/build/CD-administrator/debian-cd.patch.nolocal)
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.stretch	                        (rev 0)
+++ trunk/src/build/CD-administrator/debian-cd.patch.stretch	2017-01-25 19:35:01 UTC (rev 88265)
@@ -0,0 +1,52 @@
+diff -ur debian-cd.unpatched.trunk/tasks/jessie/exclude debian-cd/tasks/jessie/exclude
+--- debian-cd.unpatched.trunk/tasks/jessie/exclude	2007-11-25 11:32:14.000000000 +0100
++++ debian-cd/tasks/jessie/exclude	2007-12-12 20:59:05.000000000 +0100
+@@ -1,1 +1,2 @@
+ /* Packages listed here are removed from CDs. */
++#include <debian-edu-exclude>
+diff -ur debian-cd.unpatched.trunk/tools/boot/jessie/boot-x86 debian-cd/tools/boot/jessie/boot-x86
+--- debian-cd.unpatched.trunk/tools/boot/jessie/boot-x86	2016-03-28 19:51:59.013156602 +0000
++++ debian-cd/tools/boot/jessie/boot-x86	2016-03-28 19:53:29.266078077 +0000
+@@ -424,8 +424,10 @@
+             instsel.cfg)
+                 continue ;;
+         esac
+-        sed -i "/^[[:space:]]\+append .*---/ s|append|append $KERNEL_PARAMS|" \
+-            $file
++        if [ -f $file ] ; then
++            sed -i "/^[[:space:]]\+append .*---/ s|append|append $KERNEL_PARAMS|" \
++                $file
++        fi
+     done
+ fi
+ 
+diff -ur debian-cd.unpatched.wheezy/tools/start_new_disc debian-cd/tools/start_new_disc
+--- debian-cd.unpatched.wheezy/tools/start_new_disc	2013-06-17 22:55:07.000000000 +0200
++++ debian-cd/tools/start_new_disc	2013-06-21 15:07:54.000000000 +0200
+@@ -150,7 +150,25 @@
+             fi
+         fi
+     else
+-        echo "not_complete" > $CDDIR/.disk/cd_type
++        if [ $DISKTYPE = DVD ] || [ $DISKTYPE = DLDVD ]; then
++            if [ "$MAXCDS"x = "1"x ]; then
++                echo "dvd/single/not_complete" > $CDDIR/.disk/cd_type
++            else
++                echo "dvd/not_complete" > $CDDIR/.disk/cd_type
++            fi
++        elif [ $DISKTYPE = BD ] || [ $DISKTYPE = DLBD ]; then
++            if [ "$MAXCDS"x = "1"x ]; then
++                echo "bluray/single/not_complete" > $CDDIR/.disk/cd_type
++            else
++                echo "bluray/not_complete" > $CDDIR/.disk/cd_type
++            fi
++        else
++            if [ "$MAXCDS"x = "1"x ]; then
++                echo "cd/single/not_complete" > $CDDIR/.disk/cd_type
++            else
++                echo "cd/not_complete" > $CDDIR/.disk/cd_type
++            fi
++        fi
+     fi
+ 
+     if [ $NUM_ARCHES -gt 1 ]; then