Adding embedded copies for syslinux bootloaders (Closes: #622838, #635933, #636217, #645406, #646387, #646799, #651520, #652437).

2012-01-22 22:18:01 +01:00 · 2012-01-22 22:18:01 +01:00 · db064f3787
parent 4e2a532f37
commit db064f3787
26 changed files with 272 additions and 6 deletions
--- a/contrib/syslinux-splash/splash-standard.png
+++ b/contrib/syslinux-splash/splash-standard.png
--- a/contrib/syslinux-splash/splash-standard.svg
+++ b/contrib/syslinux-splash/splash-standard.svg
@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="640"
+   height="480"
+   id="svg3320"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="splash-standard.svg">
+  <defs
+     id="defs3322" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.55"
+     inkscape:cx="310.42689"
+     inkscape:cy="216.61629"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1510"
+     inkscape:window-height="1214"
+     inkscape:window-x="616"
+     inkscape:window-y="211"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3325">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-572.3622)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3328"
+       width="640"
+       height="480"
+       x="0"
+       y="572.36218" />
+    <g
+       id="g3313"
+       transform="translate(436.643,-259.22897)">
+      <text
+         transform="scale(1.0000036,0.9999964)"
+         sodipodi:linespacing="100%"
+         id="text5905-7-6"
+         y="1051.8611"
+         x="-3.2729921"
+         style="font-size:35.65472412px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold"
+         xml:space="preserve"><tspan
+           y="1051.8611"
+           x="-3.2729921"
+           id="tspan5907-8-2"
+           sodipodi:role="line">Debian</tspan></text>
+      <g
+         i:rgbTrio="#4F008000FFFF"
+         i:dimmedPercent="50"
+         i:layer="yes"
+         id="Layer_1"
+         transform="matrix(1.3930427,0,0,1.3930427,6.7473814,866.28811)">
+        <g
+           id="g3091">
+          <path
+             id="path3093"
+             d="m 51.986,57.297 c -1.797,0.025 0.34,0.926 2.686,1.287 0.648,-0.506 1.236,-1.018 1.76,-1.516 -1.461,0.358 -2.948,0.366 -4.446,0.229"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3095"
+             d="m 61.631,54.893 c 1.07,-1.477 1.85,-3.094 2.125,-4.766 -0.24,1.192 -0.887,2.221 -1.496,3.307 -3.359,2.115 -0.316,-1.256 -0.002,-2.537 -3.612,4.546 -0.496,2.726 -0.627,3.996"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3097"
+             d="m 65.191,45.629 c 0.217,-3.236 -0.637,-2.213 -0.924,-0.978 0.335,0.174 0.6,2.281 0.924,0.978"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3099"
+             d="m 45.172,1.399 c 0.959,0.172 2.072,0.304 1.916,0.533 1.049,-0.23 1.287,-0.442 -1.916,-0.533"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3101"
+             d="M 47.088,1.932 46.41,2.072 47.041,2.016 47.088,1.932"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3103"
+             d="m 76.992,46.856 c 0.107,2.906 -0.85,4.316 -1.713,6.812 l -1.553,0.776 c -1.271,2.468 0.123,1.567 -0.787,3.53 -1.984,1.764 -6.021,5.52 -7.313,5.863 -0.943,-0.021 0.639,-1.113 0.846,-1.541 -2.656,1.824 -2.131,2.738 -6.193,3.846 L 60.16,65.878 C 50.142,70.591 36.226,61.251 36.409,48.507 c -0.107,0.809 -0.304,0.607 -0.526,0.934 -0.517,-6.557 3.028,-13.143 9.007,-15.832 5.848,-2.895 12.704,-1.707 16.893,2.197 -2.301,-3.014 -6.881,-6.209 -12.309,-5.91 -5.317,0.084 -10.291,3.463 -11.951,7.131 -2.724,1.715 -3.04,6.611 -4.227,7.507 -1.597,11.737 3.004,16.808 10.787,22.773 1.225,0.826 0.345,0.951 0.511,1.58 -2.586,-1.211 -4.954,-3.039 -6.901,-5.277 1.033,1.512 2.148,2.982 3.589,4.137 -2.438,-0.826 -5.695,-5.908 -6.646,-6.115 4.203,7.525 17.052,13.197 23.78,10.383 -3.113,0.115 -7.068,0.064 -10.566,-1.229 -1.469,-0.756 -3.467,-2.322 -3.11,-2.615 9.182,3.43 18.667,2.598 26.612,-3.771 2.021,-1.574 4.229,-4.252 4.867,-4.289 -0.961,1.445 0.164,0.695 -0.574,1.971 2.014,-3.248 -0.875,-1.322 2.082,-5.609 l 1.092,1.504 c -0.406,-2.696 3.348,-5.97 2.967,-10.234 0.861,-1.304 0.961,1.403 0.047,4.403 1.268,-3.328 0.334,-3.863 0.66,-6.609 0.352,0.923 0.814,1.904 1.051,2.878 -0.826,-3.216 0.848,-5.416 1.262,-7.285 -0.408,-0.181 -1.275,1.422 -1.473,-2.377 0.029,-1.65 0.459,-0.865 0.625,-1.271 -0.324,-0.186 -1.174,-1.451 -1.691,-3.877 0.375,-0.57 1.002,1.478 1.512,1.562 -0.328,-1.929 -0.893,-3.4 -0.916,-4.88 -1.49,-3.114 -0.527,0.415 -1.736,-1.337 -1.586,-4.947 1.316,-1.148 1.512,-3.396 2.404,3.483 3.775,8.881 4.404,11.117 -0.48,-2.726 -1.256,-5.367 -2.203,-7.922 0.73,0.307 -1.176,-5.609 0.949,-1.691 C 83.519,18.706 76.074,10.902 69.225,7.24 70.063,8.007 71.121,8.97 70.741,9.121 67.335,7.093 67.934,6.935 67.446,6.078 64.671,4.949 64.489,6.169 62.651,6.08 57.421,3.306 56.413,3.601 51.6,1.863 l 0.219,1.023 c -3.465,-1.154 -4.037,0.438 -7.782,0.004 -0.228,-0.178 1.2,-0.644 2.375,-0.815 -3.35,0.442 -3.193,-0.66 -6.471,0.122 0.808,-0.567 1.662,-0.942 2.524,-1.424 -2.732,0.166 -6.522,1.59 -5.352,0.295 -4.456,1.988 -12.37,4.779 -16.811,8.943 l -0.14,-0.933 c -2.035,2.443 -8.874,7.296 -9.419,10.46 l -0.544,0.127 c -1.059,1.793 -1.744,3.825 -2.584,5.67 -1.385,2.36 -2.03,0.908 -1.833,1.278 -2.724,5.523 -4.077,10.164 -5.246,13.97 0.833,1.245 0.02,7.495 0.335,12.497 -1.368,24.704 17.338,48.69 37.785,54.228 2.997,1.072 7.454,1.031 11.245,1.141 -4.473,-1.279 -5.051,-0.678 -9.408,-2.197 -3.143,-1.48 -3.832,-3.17 -6.058,-5.102 l 0.881,1.557 c -4.366,-1.545 -2.539,-1.912 -6.091,-3.037 l 0.941,-1.229 C 28.751,98.334 26.418,96.056 25.78,94.795 l -1.548,0.061 c -1.86,-2.295 -2.851,-3.949 -2.779,-5.23 l -0.5,0.891 c -0.567,-0.973 -6.843,-8.607 -3.587,-6.83 -0.605,-0.553 -1.409,-0.9 -2.281,-2.484 l 0.663,-0.758 c -1.567,-2.016 -2.884,-4.6 -2.784,-5.461 0.836,1.129 1.416,1.34 1.99,1.533 -3.957,-9.818 -4.179,-0.541 -7.176,-9.994 L 8.412,66.472 C 7.926,65.74 7.631,64.945 7.24,64.165 l 0.276,-2.75 C 4.667,58.121 6.719,47.409 7.13,41.534 7.415,39.145 9.508,36.602 11.1,32.614 l -0.97,-0.167 c 1.854,-3.234 10.586,-12.988 14.63,-12.486 1.959,-2.461 -0.389,-0.009 -0.772,-0.629 4.303,-4.453 5.656,-3.146 8.56,-3.947 3.132,-1.859 -2.688,0.725 -1.203,-0.709 5.414,-1.383 3.837,-3.144 10.9,-3.846 0.745,0.424 -1.729,0.655 -2.35,1.205 4.511,-2.207 14.275,-1.705 20.617,1.225 7.359,3.439 15.627,13.605 15.953,23.17 l 0.371,0.1 c -0.188,3.802 0.582,8.199 -0.752,12.238 l 0.908,-1.912"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3105"
+             d="m 32.372,59.764 -0.252,1.26 c 1.181,1.604 2.118,3.342 3.626,4.596 -1.085,-2.118 -1.891,-2.993 -3.374,-5.856"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3107"
+             d="m 35.164,59.654 c -0.625,-0.691 -0.995,-1.523 -1.409,-2.352 0.396,1.457 1.207,2.709 1.962,3.982 l -0.553,-1.63"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3109"
+             d="m 84.568,48.916 -0.264,0.662 c -0.484,3.438 -1.529,6.84 -3.131,9.994 1.77,-3.328 2.915,-6.968 3.395,-10.656"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3111"
+             d="M 45.527,0.537 C 46.742,0.092 48.514,0.293 49.803,0 48.123,0.141 46.451,0.225 44.8,0.438 l 0.727,0.099"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3113"
+             d="m 2.872,23.219 c 0.28,2.592 -1.95,3.598 0.494,1.889 1.31,-2.951 -0.512,-0.815 -0.494,-1.889"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+          <path
+             id="path3115"
+             d="M 0,35.215 C 0.563,33.487 0.665,32.449 0.88,31.449 -0.676,33.438 0.164,33.862 0,35.215"
+             i:knockout="Off"
+             inkscape:connector-curvature="0"
+             style="fill:#d70751" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
--- a/debian/copyright
+++ b/debian/copyright
@ -9,6 +9,11 @@ License: GPL-3+
 Files: contrib/grub-splash/lenny
 License: other

+Files:
+ contrib/syslinux-splash/*
+ 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 +57,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@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.
--- a/share/bootloaders/isolinux/install.cfg
+++ b/share/bootloaders/isolinux/install.cfg
@ -0,0 +1 @@
+# FIXME
--- a/share/bootloaders/isolinux/isolinux.bin
+++ b/share/bootloaders/isolinux/isolinux.bin
@ -0,0 +1 @@
+/usr/lib/syslinux/isolinux.bin
--- a/share/bootloaders/isolinux/isolinux.cfg
+++ b/share/bootloaders/isolinux/isolinux.cfg
@ -0,0 +1,4 @@
+include menu.cfg
+default vesamenu.c32
+prompt 0
+timeout 0
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@ -1,5 +1,3 @@
-default live
-
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
--- a/share/bootloaders/isolinux/menu.cfg
+++ 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
--- a/share/bootloaders/isolinux/splash.png
+++ b/share/bootloaders/isolinux/splash.png
--- a/share/bootloaders/isolinux/stdmenu.cfg
+++ 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
--- a/share/bootloaders/isolinux/vesamenu.c32
+++ b/share/bootloaders/isolinux/vesamenu.c32
@ -0,0 +1 @@
+/usr/lib/syslinux/vesamenu.c32
--- a/share/bootloaders/pxelinux/install.cfg
+++ b/share/bootloaders/pxelinux/install.cfg
@ -0,0 +1 @@
+# FIXME
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@ -1,5 +1,3 @@
-default live
-
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
--- a/share/bootloaders/pxelinux/menu.cfg
+++ 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
--- a/share/bootloaders/pxelinux/pxelinux.0
+++ b/share/bootloaders/pxelinux/pxelinux.0
@ -0,0 +1 @@
+/usr/lib/syslinux/pxelinux.0
--- a/share/bootloaders/pxelinux/pxelinux.cfg
+++ b/share/bootloaders/pxelinux/pxelinux.cfg
@ -0,0 +1,4 @@
+include menu.cfg
+default vesamenu.c32
+prompt 0
+timeout 0
--- a/share/bootloaders/pxelinux/splash.png
+++ b/share/bootloaders/pxelinux/splash.png
--- a/share/bootloaders/pxelinux/stdmenu.cfg
+++ 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
--- a/share/bootloaders/pxelinux/vesamenu.c32
+++ b/share/bootloaders/pxelinux/vesamenu.c32
@ -0,0 +1 @@
+/usr/lib/syslinux/vesamenu.c32
--- a/share/bootloaders/syslinux/install.cfg
+++ b/share/bootloaders/syslinux/install.cfg
@ -0,0 +1 @@
+# FIXME
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@ -1,5 +1,3 @@
-default live
-
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
--- a/share/bootloaders/syslinux/menu.cfg
+++ 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
--- a/share/bootloaders/syslinux/splash.png
+++ b/share/bootloaders/syslinux/splash.png
--- a/share/bootloaders/syslinux/stdmenu.cfg
+++ 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
--- a/share/bootloaders/syslinux/syslinux.cfg
+++ b/share/bootloaders/syslinux/syslinux.cfg
@ -0,0 +1,4 @@
+include menu.cfg
+default vesamenu.c32
+prompt 0
+timeout 0
--- a/share/bootloaders/syslinux/vesamenu.c32
+++ b/share/bootloaders/syslinux/vesamenu.c32
@ -0,0 +1 @@
+/usr/lib/syslinux/vesamenu.c32