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

[pere at alioth.debian.org]

Author: pere
Date: 2016-03-28 19:55:35 +0000 (Mon, 28 Mar 2016)
New Revision: 87063

Modified:
   trunk/src/build/CD-administrator/debian-cd.patch.nolocal
Log:
Update patch to latest upstream source.

Modified: trunk/src/build/CD-administrator/debian-cd.patch.nolocal
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.nolocal	2016-03-28 19:01:06 UTC (rev 87062)
+++ trunk/src/build/CD-administrator/debian-cd.patch.nolocal	2016-03-28 19:55:35 UTC (rev 87063)
@@ -5,19 +5,19 @@
  /* 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
+--- 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