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

[pere at alioth.debian.org]

Author: pere
Date: 2014-09-27 02:55:08 +0000 (Sat, 27 Sep 2014)
New Revision: 83872

Modified:
   trunk/src/build/CD-administrator/debian-cd.patch.nolocal
Log:
Try harder to get ISO building.

Modified: trunk/src/build/CD-administrator/debian-cd.patch.nolocal
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.nolocal	2014-09-27 02:28:01 UTC (rev 83871)
+++ trunk/src/build/CD-administrator/debian-cd.patch.nolocal	2014-09-27 02:55:08 UTC (rev 83872)
@@ -2,5 +2,21 @@
 --- 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 @@
- acorn-fdisk
+ /* 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	2014-09-27 04:26:04.116663736 +0200
++++ debian-cd/tools/boot/jessie/boot-x86	2014-09-27 04:52:46.128398887 +0200
+@@ -369,8 +369,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
+