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

[pere at alioth.debian.org]

Author: pere
Date: 2014-11-13 02:59:04 +0000 (Thu, 13 Nov 2014)
New Revision: 84159

Modified:
   trunk/src/build/CD-administrator/debian-cd.patch.jessie
   trunk/src/build/CD-administrator/debian-cd.patch.nolocal
Log:
Patch debian-cd to set ISO type also for non-complete builds, to make sure the usbstick ISO is properly recognized by debian-edu-install.

Modified: trunk/src/build/CD-administrator/debian-cd.patch.jessie
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.jessie	2014-11-13 00:59:48 UTC (rev 84158)
+++ trunk/src/build/CD-administrator/debian-cd.patch.jessie	2014-11-13 02:59:04 UTC (rev 84159)
@@ -11,12 +11,42 @@
  			instsel.cfg)
  				continue ;;
  		esac
--		sed -i "/^[[:space:]]\+append .*--/ s|append|append $KERNEL_PARAMS|" \
+-		sed -i "/^[[:space:]]\+append .*---/ s|append|append $KERNEL_PARAMS|" \
 -			$file
 +		if [ -f $file ] ; then
-+			sed -i "/^[[:space:]]\+append .*--/ s|append|append $KERNEL_PARAMS|" \
++			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

Modified: trunk/src/build/CD-administrator/debian-cd.patch.nolocal
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.nolocal	2014-11-13 00:59:48 UTC (rev 84158)
+++ trunk/src/build/CD-administrator/debian-cd.patch.nolocal	2014-11-13 02:59:04 UTC (rev 84159)
@@ -11,12 +11,42 @@
  			instsel.cfg)
  				continue ;;
  		esac
--		sed -i "/^[[:space:]]\+append .*--/ s|append|append $KERNEL_PARAMS|" \
+-		sed -i "/^[[:space:]]\+append .*---/ s|append|append $KERNEL_PARAMS|" \
 -			$file
 +		if [ -f $file ] ; then
-+			sed -i "/^[[:space:]]\+append .*--/ s|append|append $KERNEL_PARAMS|" \
++			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