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

Proposed by Dimitri John Ledkov
Status: Work in progress
Proposed branch: lp:~xnox/debian-cd/disco-colours
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 78 lines (+34/-27)
1 file modified
tools/boot/disco/boot-amd64 (+34/-27)
To merge this branch: bzr merge lp:~xnox/debian-cd/disco-colours
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) Needs Resubmitting
Steve Langasek Needs Fixing
Review via email: mp+358311@code.launchpad.net

Commit message

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.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
Revision history for this message
Dimitri John Ledkov (xnox) :
Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
Revision history for this message
Steve Langasek (vorlon) :
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

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

review: Needs Resubmitting

Unmerged revisions

2009. By Dimitri John Ledkov

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

2008. By Dimitri John Ledkov

Set background color in grub config too.

2007. By Dimitri John Ledkov

Switch ubuntu to the correct dark aubergine.

2006. By Dimitri John Ledkov

Refactor color-branding gfxboot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/disco/boot-amd64'
2--- tools/boot/disco/boot-amd64 2018-10-30 13:12:35 +0000
3+++ tools/boot/disco/boot-amd64 2018-11-05 11:06:56 +0000
4@@ -309,6 +309,8 @@
5 mv boot$N/isolinux/grub/* $CDDIR/boot/grub/
6 rmdir boot$N/isolinux/grub
7 sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg
8+# just in case d-i/mini.iso starts to set dark aubergine
9+sed -i '/^if background_color/Q' $CDDIR/boot/grub/grub.cfg || true
10
11 if [ "$BACKPORT_KERNEL" ]; then
12 cat > $CDDIR/boot/grub/hwe-grub.cfg <<EOF
13@@ -361,33 +363,38 @@
14 ui gfxboot bootlogo
15 EOF
16 fi
17-if [ "$PROJECT" = ubuntu ] || [ "$PROJECT" = ubuntu-server ] || \
18- [ "$PROJECT" = ubuntu-mid ] || [ "$PROJECT" = ubuntu-netbook ] || \
19- [ "$PROJECT" = mythbuntu ] || [ "$PROJECT" = ubuntukylin ] || \
20- [ "$PROJECT" = ubuntu-desktop-next ]; then
21- cat >> boot$N/isolinux/gfxboot.cfg <<EOF
22-foreground=0xFFFFFF
23-background=0x958490
24-screen-colour=0x270A1E
25-EOF
26-fi
27-if [ "$PROJECT" = ubuntu-gnome ]; then
28- cat >> boot$N/isolinux/gfxboot.cfg <<EOF
29-screen-colour=0x2D3335
30-EOF
31-fi
32-if [ "$PROJECT" = ubuntu-budgie ]; then
33- cat >> boot$N/isolinux/gfxboot.cfg <<EOF
34-foreground=0xffffff
35-background=0xd3dae3
36-screen-colour=0x383c4a
37-EOF
38-fi
39-if [ "$PROJECT" = ubuntu-mate ]; then
40- cat >> boot$N/isolinux/gfxboot.cfg <<EOF
41-foreground=0xffffff
42-background=0x87a556
43-screen-colour=0x3c3b37
44+case $PROJECT in
45+ ubuntu|ubuntu-server|ubuntukylin|mythbuntu|ubuntu-mid|ubuntu-netbook|ubuntu-desktop-next)
46+ FOREGROUND=FFFFFF
47+ BACKGROUND=958490
48+ SCREENCOLOUR=2C001E
49+ ;;
50+ ubuntu-gnome)
51+ SCREENCOLOUR=2D3335
52+ ;;
53+ ubuntu-budgie)
54+ FOREGROUND=ffffff
55+ BACKGROUND=d3dae3
56+ SCREENCOLOUR=383c4a
57+ ;;
58+ ubuntu-mate)
59+ FOREGROUND=ffffff
60+ BACKGROUND=87a556
61+ SCREENCOLOUR=3c3b37
62+ ;;
63+esac
64+if [ -n "$FOREGROUND" ]; then
65+ echo "foreground=0x$FOREGROUND" >> boot$N/isolinux/gfxboot.cfg
66+fi
67+if [ -n "$BACKGROUND" ]; then
68+ echo "background=0x$BACKGROUND" >> boot$N/isolinux/gfxboot.cfg
69+fi
70+if [ -n "$SCREENCOLOUR" ]; then
71+ echo "screen-colour=0x$SCREENCOLOUR" >> boot$N/isolinux/gfxboot.cfg
72+ cat >> $CDDIR/boot/grub/grub.cfg <<EOF
73+if background_color "#$SCREENCOLOUR"; then
74+ clear
75+fi
76 EOF
77 fi
78 if [ "$HIDDEN_TIMEOUT" ]; then

Subscribers

People subscribed via source and target branches