Merge lp:~cyphermox/debian-cd/fix-errors into lp:~ubuntu-cdimage/debian-cd/ubun3

[Mathieu Trudel-Lapierre]

Fix syntax errors, missing fi's from the previous ubuntu-mate merge.

[Mathieu Trudel-Lapierre (cyphermox)]

This is intended to fix http://people.canonical.com/~ubuntu-archive/cd-build-logs/ubuntu/vivid/daily-live-20150204.log:

/srv/cdimage.ubuntu.com/debian-cd/tools/boot/vivid/boot-i386: line 563: syntax error: unexpected end of file
make: *** [/srv/cdimage.ubuntu.com/scratch/ubuntu/vivid/daily-live/tmp/vivid-i386/bootable-stamp] Error 2

(and the equivalent for boot-amd64+mac)

[Michael Vogt (mvo)]

LGTM!

review: Approve

=== modified file 'tools/boot/vivid/boot-amd64+mac'
--- tools/boot/vivid/boot-amd64+mac	2015-01-12 15:59:57 +0000
+++ tools/boot/vivid/boot-amd64+mac	2015-02-04 14:30:52 +0000
@@ -318,6 +318,7 @@
 background=0x87a556
 screen-colour=0x3c3b37
 EOF
+fi
 if [ "$HIDDEN_TIMEOUT" ]; then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 hidden-timeout=$HIDDEN_TIMEOUT

=== modified file 'tools/boot/vivid/boot-i386'
--- tools/boot/vivid/boot-i386	2015-01-12 15:59:57 +0000
+++ tools/boot/vivid/boot-i386	2015-02-04 14:30:52 +0000
@@ -323,6 +323,7 @@
 background=0x87a556
 screen-colour=0x3c3b37
 EOF
+fi
 if [ "$HIDDEN_TIMEOUT" ]; then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 hidden-timeout=$HIDDEN_TIMEOUT