summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-26 12:38:38 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:19:23 +0100
commitc5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a (patch)
tree44a6d3a12cd11067aea2a4d43eb9133cc25bad2f /templates
parent941a47be0ca3061f54a237583092357d1ff80f7c (diff)
downloadvyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.tar.gz
vyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.zip
Adding debian version 3.0~a1-1.
Diffstat (limited to 'templates')
-rw-r--r--templates/cgi/debian-official/form.html6
-rw-r--r--templates/cgi/debian-official/header.html2
-rw-r--r--templates/cgi/debian-unofficial/form.html6
-rw-r--r--templates/cgi/debian-unofficial/header.html2
-rw-r--r--templates/syslinux/ca/f10.txt2
-rw-r--r--templates/syslinux/en/f10.txt2
-rw-r--r--templates/syslinux/es/f10.txt2
-rw-r--r--templates/syslinux/menu/menu.cfg2
-rw-r--r--templates/syslinux/menu/splash.pngbin5264 -> 14330 bytes
-rw-r--r--templates/syslinux/menu/stdmenu.cfg2
10 files changed, 13 insertions, 13 deletions
diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index c54a4a435..4c8018dcb 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -25,7 +25,7 @@
<td><label for="Binary_Images">--binary-images:</label> </td>
<td>
<select id="Binary_Images" name="binary_images" size="1">
- <option selected value="iso-hybrid">iso-hybrid</option>
+ <option selected value="iso">iso</option>
<option value="net">net</option>
<option value="tar">tar</option>
<option value="usb-hdd">usb-hdd</option>
@@ -36,8 +36,8 @@
<td><label for="Distribution">--distribution:</label> </td>
<td>
<select id="Distribution" name="distribution" size="1">
- <option value="lenny">lenny</option>
- <option selected value="squeeze">squeeze</option>
+ <option selected value="lenny">lenny</option>
+ <option value="squeeze">squeeze</option>
<option value="sid">sid</option>
</select>
</td>
diff --git a/templates/cgi/debian-official/header.html b/templates/cgi/debian-official/header.html
index 096303e25..009650f1f 100644
--- a/templates/cgi/debian-official/header.html
+++ b/templates/cgi/debian-official/header.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
- <title>Debian Live Build</title>
+ <title>Debian Live Helper</title>
<link rel="icon" href="http://live.debian.net/favicon.ico" type="image/ico">
<link rel="stylesheet" type="text/css" href="http://live.debian.net/stylesheet.css" />
<meta http-equiv="content-type" content="text/html; charset=iso-8859-15">
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index 44982ca17..acb3ccf37 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -24,7 +24,7 @@
<td><label for="Binary_Images">--binary-images:</label> </td>
<td>
<select id="Binary_Images" name="binary_images" size="1">
- <option selected value="iso-hybrid">iso-hybrid</option>
+ <option selected value="iso">iso</option>
<option value="net">net</option>
<option value="tar">tar</option>
<option value="usb-hdd">usb-hdd</option>
@@ -35,8 +35,8 @@
<td><label for="Distribution">--distribution:</label> </td>
<td>
<select id="Distribution" name="distribution" size="1">
- <option value="lenny">lenny</option>
- <option selected value="squeeze">squeeze</option>
+ <option selected value="lenny">lenny</option>
+ <option value="squeeze">squeeze</option>
<option value="sid">sid</option>
</select>
</td>
diff --git a/templates/cgi/debian-unofficial/header.html b/templates/cgi/debian-unofficial/header.html
index 096303e25..009650f1f 100644
--- a/templates/cgi/debian-unofficial/header.html
+++ b/templates/cgi/debian-unofficial/header.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
- <title>Debian Live Build</title>
+ <title>Debian Live Helper</title>
<link rel="icon" href="http://live.debian.net/favicon.ico" type="image/ico">
<link rel="stylesheet" type="text/css" href="http://live.debian.net/stylesheet.css" />
<meta http-equiv="content-type" content="text/html; charset=iso-8859-15">
diff --git a/templates/syslinux/ca/f10.txt b/templates/syslinux/ca/f10.txt
index 95c71c97d..217d106fb 100644
--- a/templates/syslinux/ca/f10.txt
+++ b/templates/syslinux/ca/f10.txt
@@ -1,6 +1,6 @@
 0fCOPYRIGHTS I GARANTIES07 09F1007
-Debian GNU/Linux t‚ Copyright (C) 1993-2011 de Software in the Public Interest,
+Debian GNU/Linux t‚ Copyright (C) 1993-2010 de Software in the Public Interest,
i altres.
El sistema Debian GNU/Linux ‚s pot redistribuir lliurement. DesprŠs de la
diff --git a/templates/syslinux/en/f10.txt b/templates/syslinux/en/f10.txt
index a1164b0d4..6780e67e0 100644
--- a/templates/syslinux/en/f10.txt
+++ b/templates/syslinux/en/f10.txt
@@ -1,6 +1,6 @@
 0fCOPYRIGHTS AND WARRANTIES07 09F1007
-Debian GNU/Linux is Copyright (C) 1993-2011 Software in the Public Interest,
+Debian GNU/Linux is Copyright (C) 1993-2010 Software in the Public Interest,
and others.
The Debian GNU/Linux system is freely redistributable. After installation,
diff --git a/templates/syslinux/es/f10.txt b/templates/syslinux/es/f10.txt
index 44e1a4c93..36eedd7a3 100644
--- a/templates/syslinux/es/f10.txt
+++ b/templates/syslinux/es/f10.txt
@@ -1,6 +1,6 @@
 0fCOPYRIGHTS Y GARANTˇAS07 09F1007
-Debian GNU/Linux es Copyright (C) 1993-2011 de Software in the Public Interest,
+Debian GNU/Linux es Copyright (C) 1993-2010 de Software in the Public Interest,
y otros.
El sistema Debian GNU/Linux es libremente redistribuible. Despu‚s de la
diff --git a/templates/syslinux/menu/menu.cfg b/templates/syslinux/menu/menu.cfg
index 8c010bc18..a74b4d597 100644
--- a/templates/syslinux/menu/menu.cfg
+++ b/templates/syslinux/menu/menu.cfg
@@ -1,4 +1,4 @@
-menu hshift 15
+menu hshift 13
menu width 49
menu title Boot menu
diff --git a/templates/syslinux/menu/splash.png b/templates/syslinux/menu/splash.png
index 32f097d10..b3877c517 100644
--- a/templates/syslinux/menu/splash.png
+++ b/templates/syslinux/menu/splash.png
Binary files differ
diff --git a/templates/syslinux/menu/stdmenu.cfg b/templates/syslinux/menu/stdmenu.cfg
index 2e8c58c27..9b10dea27 100644
--- a/templates/syslinux/menu/stdmenu.cfg
+++ b/templates/syslinux/menu/stdmenu.cfg
@@ -5,7 +5,7 @@ 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 vshift 12
menu rows 10
menu helpmsgrow 15
# The command line must be at least one line from the bottom.