Merge lp:~xnox/debian-cd/disco-colours into lp:~ubuntu-cdimage/debian-cd/ubun3

[Dimitri John Ledkov]

Start to use colour branding similar to the one use with grub efi & plymouth ubuntu-logo theme.
Also allow for flavours to also set similar grub efi colour branding.

[Steve Langasek (vorlon)]

review: Needs Fixing

[Steve Langasek (vorlon)]

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

Needs to be redone based on the new spinner theme & new series.

review: Needs Resubmitting

Unmerged revisions

2009. By Dimitri John Ledkov on 2018-11-05

Clear d-i branding, if it starts to have any.

2008. By Dimitri John Ledkov on 2018-11-05

Set background color in grub config too.

2007. By Dimitri John Ledkov on 2018-11-05

Switch ubuntu to the correct dark aubergine.

2006. By Dimitri John Ledkov on 2018-11-05

Refactor color-branding gfxboot.

=== modified file 'tools/boot/disco/boot-amd64'
--- tools/boot/disco/boot-amd64	2018-10-30 13:12:35 +0000
+++ tools/boot/disco/boot-amd64	2018-11-05 11:06:56 +0000
@@ -309,6 +309,8 @@
 mv boot$N/isolinux/grub/* $CDDIR/boot/grub/
 rmdir boot$N/isolinux/grub
 sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg
+# just in case d-i/mini.iso starts to set dark aubergine
+sed -i '/^if background_color/Q' $CDDIR/boot/grub/grub.cfg || true
 
 if [ "$BACKPORT_KERNEL" ]; then
     cat > $CDDIR/boot/grub/hwe-grub.cfg <<EOF
@@ -361,33 +363,38 @@
 ui gfxboot bootlogo
 EOF
 fi
-if [ "$PROJECT" = ubuntu ] || [ "$PROJECT" = ubuntu-server ] || \
-   [ "$PROJECT" = ubuntu-mid ] || [ "$PROJECT" = ubuntu-netbook ] || \
-   [ "$PROJECT" = mythbuntu ] || [ "$PROJECT" = ubuntukylin ] || \
-   [ "$PROJECT" = ubuntu-desktop-next ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-foreground=0xFFFFFF
-background=0x958490
-screen-colour=0x270A1E
-EOF
-fi
-if [ "$PROJECT" = ubuntu-gnome ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-screen-colour=0x2D3335
-EOF
-fi
-if [ "$PROJECT" = ubuntu-budgie ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-foreground=0xffffff
-background=0xd3dae3
-screen-colour=0x383c4a
-EOF
-fi
-if [ "$PROJECT" = ubuntu-mate ]; then
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
-foreground=0xffffff
-background=0x87a556
-screen-colour=0x3c3b37
+case $PROJECT in
+    ubuntu|ubuntu-server|ubuntukylin|mythbuntu|ubuntu-mid|ubuntu-netbook|ubuntu-desktop-next)
+    FOREGROUND=FFFFFF
+    BACKGROUND=958490
+    SCREENCOLOUR=2C001E
+    ;;
+    ubuntu-gnome)
+    SCREENCOLOUR=2D3335
+    ;;
+    ubuntu-budgie)
+    FOREGROUND=ffffff
+    BACKGROUND=d3dae3
+    SCREENCOLOUR=383c4a
+    ;;
+    ubuntu-mate)
+    FOREGROUND=ffffff
+    BACKGROUND=87a556
+    SCREENCOLOUR=3c3b37
+    ;;
+esac
+if [ -n "$FOREGROUND" ]; then
+    echo "foreground=0x$FOREGROUND" >> boot$N/isolinux/gfxboot.cfg
+fi
+if [ -n "$BACKGROUND" ]; then
+    echo "background=0x$BACKGROUND" >> boot$N/isolinux/gfxboot.cfg
+fi
+if [ -n "$SCREENCOLOUR" ]; then
+    echo "screen-colour=0x$SCREENCOLOUR" >> boot$N/isolinux/gfxboot.cfg
+    cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+if background_color "#$SCREENCOLOUR"; then
+  clear
+fi
 EOF
 fi
 if [ "$HIDDEN_TIMEOUT" ]; then