debian-cd

Merge lp:~darkxst/debian-cd/ug-syslinux into lp:~ubuntu-cdimage/debian-cd/ubun3

  1. ug-syslinux
  2. Merge into ubun3
Proposed by Tim Lunn
Status: Merged
Merged at revision: 1868
Proposed branch: lp:~darkxst/debian-cd/ug-syslinux
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 43 lines (+14/-0)
2 files modified
tools/boot/saucy/boot-amd64 (+7/-0)
tools/boot/saucy/boot-i386 (+7/-0)
To merge this branch: bzr merge lp:~darkxst/debian-cd/ug-syslinux
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+183028@code.launchpad.net
To post a comment you must log in.
lp:~darkxst/debian-cd/ug-syslinux updated
1869. By Tim Lunn

update colours

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/saucy/ubuntu-gnome-access.pcx'
2Binary files data/saucy/ubuntu-gnome-access.pcx 1970-01-01 00:00:00 +0000 and data/saucy/ubuntu-gnome-access.pcx 2013-08-30 08:06:30 +0000 differ
3=== added file 'data/saucy/ubuntu-gnome-blank.pcx'
4Binary files data/saucy/ubuntu-gnome-blank.pcx 1970-01-01 00:00:00 +0000 and data/saucy/ubuntu-gnome-blank.pcx 2013-08-30 08:06:30 +0000 differ
5=== added file 'data/saucy/ubuntu-gnome.pcx'
6Binary files data/saucy/ubuntu-gnome.pcx 1970-01-01 00:00:00 +0000 and data/saucy/ubuntu-gnome.pcx 2013-08-30 08:06:30 +0000 differ
7=== added file 'data/saucy/ubuntu-gnome.png'
8Binary files data/saucy/ubuntu-gnome.png 1970-01-01 00:00:00 +0000 and data/saucy/ubuntu-gnome.png 2013-08-30 08:06:30 +0000 differ
9=== modified file 'tools/boot/saucy/boot-amd64'
10--- tools/boot/saucy/boot-amd64 2013-07-01 15:05:35 +0000
11+++ tools/boot/saucy/boot-amd64 2013-08-30 08:06:30 +0000
12@@ -329,6 +329,13 @@
13 screen-colour=0x270A1E
14 EOF
15 fi
16+if [ "$PROJECT" = ubuntu-gnome ]; then
17+ cat >> boot$N/isolinux/gfxboot.cfg <<EOF
18+foreground=0xFFFFFF
19+background=0x0087ED
20+screen-colour=0x2D3335
21+EOF
22+fi
23 if [ "$HIDDEN_TIMEOUT" ]; then
24 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
25 hidden-timeout=$HIDDEN_TIMEOUT
26
27=== modified file 'tools/boot/saucy/boot-i386'
28--- tools/boot/saucy/boot-i386 2013-07-01 15:05:35 +0000
29+++ tools/boot/saucy/boot-i386 2013-08-30 08:06:30 +0000
30@@ -309,6 +309,13 @@
31 screen-colour=0x270A1E
32 EOF
33 fi
34+if [ "$PROJECT" = ubuntu-gnome ]; then
35+ cat >> boot$N/isolinux/gfxboot.cfg <<EOF
36+foreground=0xFFFFFF
37+background=0x0087ED
38+screen-colour=0x2D3335
39+EOF
40+fi
41 if [ "$HIDDEN_TIMEOUT" ]; then
42 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
43 hidden-timeout=$HIDDEN_TIMEOUT

Subscribers

People subscribed via source and target branches