summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-04-16 03:34:21 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:32 +0100
commit0e8c38206d4928d774867831c55cd80a17b638a3 (patch)
treeb928c751697fd2f08f23f3ec494803496d92ac80
parent90be1cb4b56839c99a1ae632a019933c85920d39 (diff)
downloadvyos-live-build-0e8c38206d4928d774867831c55cd80a17b638a3.tar.gz
vyos-live-build-0e8c38206d4928d774867831c55cd80a17b638a3.zip
Fix a number of issues with Syslinux templates (Closes: #476204)
This fixes: * The ugly "toboot" and "to\nboot" problems * Mistitled F4 page * Ugly line-breaking of Debian Live URL
-rwxr-xr-xhelpers/lh_binary_syslinux1
-rw-r--r--templates/syslinux/en/f2.txt.install4
-rw-r--r--templates/syslinux/en/f2.txt.live7
-rw-r--r--templates/syslinux/en/f4.txt.live2
4 files changed, 7 insertions, 7 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 8b8fc3fe0..da3952b52 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -270,7 +270,6 @@ Configure_syslinux_templates ()
-e "s|{\$LH_MEDIA}|${MEDIA}|" \
-e "s|{\$LH_VERSION}|${VERSION}|" \
-e "s|{\$LH_SYSLINUX_TIMEOUT}|${LH_SYSLINUX_TIMEOUT}0|" \
- -e 's|\ $||g' \
$template_file
done
diff --git a/templates/syslinux/en/f2.txt.install b/templates/syslinux/en/f2.txt.install
index e4f220898..5989b29fb 100644
--- a/templates/syslinux/en/f2.txt.install
+++ b/templates/syslinux/en/f2.txt.install
@@ -2,8 +2,8 @@
You must have at least 64 megabytes of RAM to run this Debian Live system.
-See the Live Manual or the FAQ for more information; both
-documents are available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
+See the Live Manual or the FAQ for more information; both documents are
+available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
You must have at least 32 megabytes of RAM to use the Debian installer.
diff --git a/templates/syslinux/en/f2.txt.live b/templates/syslinux/en/f2.txt.live
index f79062ada..ec2430e3b 100644
--- a/templates/syslinux/en/f2.txt.live
+++ b/templates/syslinux/en/f2.txt.live
@@ -2,8 +2,8 @@
You must have at least 64 megabytes of RAM to run this Debian Live system.
-See the Live Manual or the FAQ for more information; both
-documents are available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
+See the Live Manual or the FAQ for more information; both documents are
+available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
Thank you for choosing Debian!
@@ -20,4 +20,5 @@ Thank you for choosing Debian!
-Press F1control and F then 1 for the help index, or ENTER to
+
+Press F1control and F then 1 for the help index, or ENTER to \ No newline at end of file
diff --git a/templates/syslinux/en/f4.txt.live b/templates/syslinux/en/f4.txt.live
index 52f5e8d47..be53488af 100644
--- a/templates/syslinux/en/f4.txt.live
+++ b/templates/syslinux/en/f4.txt.live
@@ -1,4 +1,4 @@
- 0fADDITIONAL BOOT METHODS07 09F307
+ 0fADDITIONAL BOOT METHODS07 09F407
0fAvailable boot methods:07