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

[pere at alioth.debian.org]

Author: pere
Date: 2015-04-26 06:41:11 +0000 (Sun, 26 Apr 2015)
New Revision: 86336

Modified:
   trunk/src/build/CD-administrator/debian-cd.patch.jessie
Log:
Update debian-cd jessie patch to match current HEAD branch.

Modified: trunk/src/build/CD-administrator/debian-cd.patch.jessie
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.jessie	2015-04-26 06:02:38 UTC (rev 86335)
+++ trunk/src/build/CD-administrator/debian-cd.patch.jessie	2015-04-26 06:41:11 UTC (rev 86336)
@@ -4,20 +4,21 @@
 @@ -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	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
+diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86
+index c6d397c..2401f46 100644
+--- a/tools/boot/jessie/boot-x86
++++ b/tools/boot/jessie/boot-x86
+@@ -424,8 +424,10 @@ if [ -n "$KERNEL_PARAMS" ]; then
+             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