summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:17 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:26 +0100
commit0d0de885e32ff67d57bb7def451b62d75b8920ab (patch)
treecd4a159a86207401dbd5990bc0fa3c28825ab6f8 /templates
parentc68c0a270832ca340429878ce6a0ab606d435b06 (diff)
downloadvyos-live-build-0d0de885e32ff67d57bb7def451b62d75b8920ab.tar.gz
vyos-live-build-0d0de885e32ff67d57bb7def451b62d75b8920ab.zip
Adding live-helper 1.0~a22-1.
Diffstat (limited to 'templates')
-rw-r--r--templates/syslinux/f1.txt.install6
-rw-r--r--templates/syslinux/f1.txt.live6
-rw-r--r--templates/syslinux/f10.txt2
-rw-r--r--templates/syslinux/f3.txt.install2
-rw-r--r--templates/syslinux/f3.txt.install.g-i2
-rw-r--r--templates/syslinux/f3.txt.live2
-rw-r--r--templates/syslinux/syslinux.cfg2
-rw-r--r--templates/yaboot/boot.msg2
-rw-r--r--templates/yaboot/pegasos2
9 files changed, 13 insertions, 13 deletions
diff --git a/templates/syslinux/f1.txt.install b/templates/syslinux/f1.txt.install
index a26234f33..80026b6d2 100644
--- a/templates/syslinux/f1.txt.install
+++ b/templates/syslinux/f1.txt.install
@@ -1,7 +1,7 @@
 0fWelcome to Debian GNU/Linux!07 09F107
-This is a Debian LIVE_DISTRIBUTION combined live and installation LIVE_MEDIA.
-It was built on LIVE_DATE.
+This is a Debian LH_DISTRIBUTION combined live and installation LH_MEDIA.
+It was built on LH_DATE.
0fHELP INDEX07
@@ -9,7 +9,7 @@ It was built on LIVE_DATE.
<09F107> This page, the help index.
<09F207> Prerequisites for installing Debian.
-<09F307> Boot methods for special ways of using this LIVE_MEDIA
+<09F307> Boot methods for special ways of using this LH_MEDIA
<09F407> Additional boot methods; rescue mode.
<09F507> Special boot parameters, overview.
<09F607> Special boot parameters for special machines.
diff --git a/templates/syslinux/f1.txt.live b/templates/syslinux/f1.txt.live
index 5a6aecff3..f6f33ef71 100644
--- a/templates/syslinux/f1.txt.live
+++ b/templates/syslinux/f1.txt.live
@@ -1,7 +1,7 @@
 0fWelcome to Debian GNU/Linux!07 09F107
-This is a Debian LIVE_DISTRIBUTION live LIVE_MEDIA.
-It was built on LIVE_DATE.
+This is a Debian LH_DISTRIBUTION live LH_MEDIA.
+It was built on LH_DATE.
0fHELP INDEX07
@@ -9,7 +9,7 @@ It was built on LIVE_DATE.
<09F107> This page, the help index.
<09F207> Prerequisites for installing Debian.
-<09F307> Boot methods for special ways of using this LIVE_MEDIA
+<09F307> Boot methods for special ways of using this LH_MEDIA
<09F407> Additional boot methods.
<09F507> Special boot parameters, overview.
<09F607> Special boot parameters for special machines.
diff --git a/templates/syslinux/f10.txt b/templates/syslinux/f10.txt
index a1ce65685..3cf379e1b 100644
--- a/templates/syslinux/f10.txt
+++ b/templates/syslinux/f10.txt
@@ -12,7 +12,7 @@ permitted by applicable law.
---
-This Debian Live system was built with live-helper, version LIVE_VERSION.
+This Debian Live system was built with live-helper, version LH_VERSION.
More information about the Debian Live project can be found at
<http://debian-live.alioth.debian.org/>.
diff --git a/templates/syslinux/f3.txt.install b/templates/syslinux/f3.txt.install
index db597170f..233f267d2 100644
--- a/templates/syslinux/f3.txt.install
+++ b/templates/syslinux/f3.txt.install
@@ -3,7 +3,7 @@
0fAvailable boot methods:07
0flive07
- Start the live system -- this is the default LIVE_MEDIA method.
+ Start the live system -- this is the default LH_MEDIA method.
0flive-failsafe07
Start the live system in fail-safe mode.
0finstall07
diff --git a/templates/syslinux/f3.txt.install.g-i b/templates/syslinux/f3.txt.install.g-i
index 445ddbd0c..745685d30 100644
--- a/templates/syslinux/f3.txt.install.g-i
+++ b/templates/syslinux/f3.txt.install.g-i
@@ -3,7 +3,7 @@
0fAvailable boot methods:07
0flive07
- Start the live system -- this is the default LIVE_MEDIA method.
+ Start the live system -- this is the default LH_MEDIA method.
0flive-failsafe07
Start the live system in fail-safe mode.
0finstall07 or 0finstallgui07
diff --git a/templates/syslinux/f3.txt.live b/templates/syslinux/f3.txt.live
index 397c64933..b48ab8d08 100644
--- a/templates/syslinux/f3.txt.live
+++ b/templates/syslinux/f3.txt.live
@@ -3,7 +3,7 @@
0fAvailable boot methods:07
0flive07
- Start the live system -- this is the default LIVE_MEDIA method.
+ Start the live system -- this is the default LH_MEDIA method.
0flive-failsafe07
Start the live system in fail-safe mode.
diff --git a/templates/syslinux/syslinux.cfg b/templates/syslinux/syslinux.cfg
index 48599ed08..6c3ba7f88 100644
--- a/templates/syslinux/syslinux.cfg
+++ b/templates/syslinux/syslinux.cfg
@@ -33,4 +33,4 @@ LABEL nextboot
localboot -1
PROMPT 1
-TIMEOUT 0
+TIMEOUT LINUX_TIMEOUT
diff --git a/templates/yaboot/boot.msg b/templates/yaboot/boot.msg
index 8fc17b04c..98f5876f6 100644
--- a/templates/yaboot/boot.msg
+++ b/templates/yaboot/boot.msg
@@ -1,7 +1,7 @@
Welcome to Debian GNU/Linux!
This is a Debian Live CDROM,
-built on LIVE_DATE.
+built on LH_DATE.
The default option is 'live'.
diff --git a/templates/yaboot/pegasos b/templates/yaboot/pegasos
index 7a8758ad5..1e1b24175 100644
--- a/templates/yaboot/pegasos
+++ b/templates/yaboot/pegasos
@@ -18,7 +18,7 @@
." Welcome to Debian GNU/Linux!" cr
." " cr
." This is a Debian Live CDROM," cr
- ." built on LIVE_DATE." cr
+ ." built on LH_DATE." cr
." " cr
." The default option is 'live'." cr
." " cr