[SCM] live-build branch, debian-next, updated. debian/3.0_a42-1-5-g28e803e
Daniel Baumann
daniel at debian.org
Sun Jan 22 21:21:28 UTC 2012
The following commit has been merged in the debian-next branch:
commit 28e803e3698c7211ceb78aa191bf5103b1c364bd
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jan 22 22:18:01 2012 +0100
Adding embedded copies for syslinux bootloaders (Closes: #622838, #635933, #636217, #645406, #646387, #646799, #651520, #652437).
diff --git a/debian/copyright b/debian/copyright
index 31e44d4..fb40563 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,9 @@ License: GPL-3+
Files: contrib/grub-splash/lenny
License: other
+Files: share/bootloaders/*/splash.png
+License: other
+
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -52,3 +55,19 @@ License: other
.
Note: we would appreciate that you make the image a link to
http://www.debian.org/ if you use it on a web page.
+
+License: other
+ The splash for Debian Live was made by Daniel Baumann <daniel at debian.org> based
+ on the Debian Open Use Logo.
+ .
+ The contribution of Daniel is hereby placed in the public domain (no rights
+ reserved).
+ .
+ Debian Open Use Logo License
+ .
+ Copyright (c) 1999 Software in the Public Interest
+ This logo or a modified version may be used by anyone to refer to the Debian
+ project, but does not indicate endorsement by the project.
+ .
+ Note: we would appreciate that you make the image a link to
+ http://www.debian.org/ if you use it on a web page.
diff --git a/share/bootloaders/isolinux/install.cfg b/share/bootloaders/isolinux/install.cfg
new file mode 100644
index 0000000..94fb816
--- /dev/null
+++ b/share/bootloaders/isolinux/install.cfg
@@ -0,0 +1 @@
+# FIXME
diff --git a/share/bootloaders/isolinux/isolinux.bin b/share/bootloaders/isolinux/isolinux.bin
new file mode 120000
index 0000000..0e3eb53
--- /dev/null
+++ b/share/bootloaders/isolinux/isolinux.bin
@@ -0,0 +1 @@
+/usr/lib/syslinux/isolinux.bin
\ No newline at end of file
diff --git a/share/bootloaders/isolinux/isolinux.cfg b/share/bootloaders/isolinux/isolinux.cfg
new file mode 100644
index 0000000..a3e3eab
--- /dev/null
+++ b/share/bootloaders/isolinux/isolinux.cfg
@@ -0,0 +1,4 @@
+include menu.cfg
+default vesamenu.c32
+prompt 0
+timeout 0
diff --git a/share/bootloaders/isolinux/live.cfg b/share/bootloaders/isolinux/live.cfg
new file mode 100644
index 0000000..9c87ffe
--- /dev/null
+++ b/share/bootloaders/isolinux/live.cfg
@@ -0,0 +1,6 @@
+default live
+label live
+ menu label ^Live
+ menu default
+ kernel /live/vmlinuz
+ append initrd=/live/initrd.img boot=live config @LB_BOOTAPPEND_LIVE@
diff --git a/share/bootloaders/isolinux/menu.cfg b/share/bootloaders/isolinux/menu.cfg
new file mode 100644
index 0000000..2981296
--- /dev/null
+++ b/share/bootloaders/isolinux/menu.cfg
@@ -0,0 +1,8 @@
+menu hshift 0
+menu width 82
+
+menu title Boot menu
+include stdmenu.cfg
+include live.cfg
+include install.cfg
+menu end
diff --git a/share/bootloaders/isolinux/splash.png b/share/bootloaders/isolinux/splash.png
new file mode 100644
index 0000000..32f097d
Binary files /dev/null and b/share/bootloaders/isolinux/splash.png differ
diff --git a/share/bootloaders/isolinux/stdmenu.cfg b/share/bootloaders/isolinux/stdmenu.cfg
new file mode 100644
index 0000000..d4036bf
--- /dev/null
+++ b/share/bootloaders/isolinux/stdmenu.cfg
@@ -0,0 +1,15 @@
+menu background splash.png
+menu color title * #FFFFFFFF *
+menu color border * #00000000 #00000000 none
+menu color sel * #ffffffff #76a1d0ff *
+menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
+menu color tabmsg * #ffffffff #00000000 *
+menu color help 37;40 #ffdddd00 #00000000 none
+menu vshift 17
+menu rows 10
+menu helpmsgrow 15
+# The command line must be at least one line from the bottom.
+menu cmdlinerow 16
+menu timeoutrow 16
+menu tabmsgrow 18
+menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/share/bootloaders/isolinux/vesamenu.c32 b/share/bootloaders/isolinux/vesamenu.c32
new file mode 120000
index 0000000..d06c444
--- /dev/null
+++ b/share/bootloaders/isolinux/vesamenu.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/install.cfg b/share/bootloaders/pxelinux/install.cfg
new file mode 100644
index 0000000..94fb816
--- /dev/null
+++ b/share/bootloaders/pxelinux/install.cfg
@@ -0,0 +1 @@
+# FIXME
diff --git a/share/bootloaders/pxelinux/live.cfg b/share/bootloaders/pxelinux/live.cfg
new file mode 100644
index 0000000..9c87ffe
--- /dev/null
+++ b/share/bootloaders/pxelinux/live.cfg
@@ -0,0 +1,6 @@
+default live
+label live
+ menu label ^Live
+ menu default
+ kernel /live/vmlinuz
+ append initrd=/live/initrd.img boot=live config @LB_BOOTAPPEND_LIVE@
diff --git a/share/bootloaders/pxelinux/menu.cfg b/share/bootloaders/pxelinux/menu.cfg
new file mode 100644
index 0000000..2981296
--- /dev/null
+++ b/share/bootloaders/pxelinux/menu.cfg
@@ -0,0 +1,8 @@
+menu hshift 0
+menu width 82
+
+menu title Boot menu
+include stdmenu.cfg
+include live.cfg
+include install.cfg
+menu end
diff --git a/share/bootloaders/pxelinux/pxelinux.0 b/share/bootloaders/pxelinux/pxelinux.0
new file mode 120000
index 0000000..0f93aef
--- /dev/null
+++ b/share/bootloaders/pxelinux/pxelinux.0
@@ -0,0 +1 @@
+/usr/lib/syslinux/pxelinux.0
\ No newline at end of file
diff --git a/share/bootloaders/pxelinux/pxelinux.cfg b/share/bootloaders/pxelinux/pxelinux.cfg
new file mode 100644
index 0000000..a3e3eab
--- /dev/null
+++ b/share/bootloaders/pxelinux/pxelinux.cfg
@@ -0,0 +1,4 @@
+include menu.cfg
+default vesamenu.c32
+prompt 0
+timeout 0
diff --git a/share/bootloaders/pxelinux/splash.png b/share/bootloaders/pxelinux/splash.png
new file mode 100644
index 0000000..32f097d
Binary files /dev/null and b/share/bootloaders/pxelinux/splash.png differ
diff --git a/share/bootloaders/pxelinux/stdmenu.cfg b/share/bootloaders/pxelinux/stdmenu.cfg
new file mode 100644
index 0000000..d4036bf
--- /dev/null
+++ b/share/bootloaders/pxelinux/stdmenu.cfg
@@ -0,0 +1,15 @@
+menu background splash.png
+menu color title * #FFFFFFFF *
+menu color border * #00000000 #00000000 none
+menu color sel * #ffffffff #76a1d0ff *
+menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
+menu color tabmsg * #ffffffff #00000000 *
+menu color help 37;40 #ffdddd00 #00000000 none
+menu vshift 17
+menu rows 10
+menu helpmsgrow 15
+# The command line must be at least one line from the bottom.
+menu cmdlinerow 16
+menu timeoutrow 16
+menu tabmsgrow 18
+menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/share/bootloaders/pxelinux/vesamenu.c32 b/share/bootloaders/pxelinux/vesamenu.c32
new file mode 120000
index 0000000..d06c444
--- /dev/null
+++ b/share/bootloaders/pxelinux/vesamenu.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
diff --git a/share/bootloaders/syslinux/install.cfg b/share/bootloaders/syslinux/install.cfg
new file mode 100644
index 0000000..94fb816
--- /dev/null
+++ b/share/bootloaders/syslinux/install.cfg
@@ -0,0 +1 @@
+# FIXME
diff --git a/share/bootloaders/syslinux/live.cfg b/share/bootloaders/syslinux/live.cfg
new file mode 100644
index 0000000..9c87ffe
--- /dev/null
+++ b/share/bootloaders/syslinux/live.cfg
@@ -0,0 +1,6 @@
+default live
+label live
+ menu label ^Live
+ menu default
+ kernel /live/vmlinuz
+ append initrd=/live/initrd.img boot=live config @LB_BOOTAPPEND_LIVE@
diff --git a/share/bootloaders/syslinux/menu.cfg b/share/bootloaders/syslinux/menu.cfg
new file mode 100644
index 0000000..2981296
--- /dev/null
+++ b/share/bootloaders/syslinux/menu.cfg
@@ -0,0 +1,8 @@
+menu hshift 0
+menu width 82
+
+menu title Boot menu
+include stdmenu.cfg
+include live.cfg
+include install.cfg
+menu end
diff --git a/share/bootloaders/syslinux/splash.png b/share/bootloaders/syslinux/splash.png
new file mode 100644
index 0000000..32f097d
Binary files /dev/null and b/share/bootloaders/syslinux/splash.png differ
diff --git a/share/bootloaders/syslinux/stdmenu.cfg b/share/bootloaders/syslinux/stdmenu.cfg
new file mode 100644
index 0000000..d4036bf
--- /dev/null
+++ b/share/bootloaders/syslinux/stdmenu.cfg
@@ -0,0 +1,15 @@
+menu background splash.png
+menu color title * #FFFFFFFF *
+menu color border * #00000000 #00000000 none
+menu color sel * #ffffffff #76a1d0ff *
+menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
+menu color tabmsg * #ffffffff #00000000 *
+menu color help 37;40 #ffdddd00 #00000000 none
+menu vshift 17
+menu rows 10
+menu helpmsgrow 15
+# The command line must be at least one line from the bottom.
+menu cmdlinerow 16
+menu timeoutrow 16
+menu tabmsgrow 18
+menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/share/bootloaders/syslinux/syslinux.cfg b/share/bootloaders/syslinux/syslinux.cfg
new file mode 100644
index 0000000..a3e3eab
--- /dev/null
+++ b/share/bootloaders/syslinux/syslinux.cfg
@@ -0,0 +1,4 @@
+include menu.cfg
+default vesamenu.c32
+prompt 0
+timeout 0
diff --git a/share/bootloaders/syslinux/vesamenu.c32 b/share/bootloaders/syslinux/vesamenu.c32
new file mode 120000
index 0000000..d06c444
--- /dev/null
+++ b/share/bootloaders/syslinux/vesamenu.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
--
live-build
More information about the debian-live-changes
mailing list