summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-11-10 15:23:27 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:28 +0100
commit7fc3e5c0e408a206184fddf6cda1ffc8831078bd (patch)
tree6aa0ef68a2431dd7cc00d200e35833335313d52d
parent72220890bd5f0d6ace56c0e1d8139d9010bc8d0e (diff)
downloadvyos-live-build-7fc3e5c0e408a206184fddf6cda1ffc8831078bd.tar.gz
vyos-live-build-7fc3e5c0e408a206184fddf6cda1ffc8831078bd.zip
Renaming live-failsafe boot target to livefailsafe (Closes: #450576).
-rwxr-xr-xhelpers/lh_binary_syslinux2
-rw-r--r--templates/syslinux/ca/f3.txt.install2
-rw-r--r--templates/syslinux/ca/f3.txt.install.g-i2
-rw-r--r--templates/syslinux/ca/f3.txt.live2
-rw-r--r--templates/syslinux/en/f3.txt.install2
-rw-r--r--templates/syslinux/en/f3.txt.install.g-i2
-rw-r--r--templates/syslinux/en/f3.txt.live2
-rw-r--r--templates/syslinux/es/f3.txt.install2
-rw-r--r--templates/syslinux/es/f3.txt.install.g-i2
-rw-r--r--templates/syslinux/es/f3.txt.live2
10 files changed, 10 insertions, 10 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 109f96d05..afae5122b 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -117,7 +117,7 @@ Syslinux_live_entry ()
LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND}\n"
# Failsafe kernel
- LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}-failsafe\n"
+ LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}failsafe\n"
# Write the menu label if the syslinux menu is being use
LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL} Failsafe\n"
LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
diff --git a/templates/syslinux/ca/f3.txt.install b/templates/syslinux/ca/f3.txt.install
index 85c68a92b..c40302379 100644
--- a/templates/syslinux/ca/f3.txt.install
+++ b/templates/syslinux/ca/f3.txt.install
@@ -4,7 +4,7 @@
0flive07
Inicia el sistema live -- aquest es el mŠtode de LH_MEDIA per defecte.
-0flive-failsafe07
+0flivefailsafe07
Inicia el sistema en mode a prova de falles.
0finstall07
Inicia la instalúlaci˘.
diff --git a/templates/syslinux/ca/f3.txt.install.g-i b/templates/syslinux/ca/f3.txt.install.g-i
index 461d77c6f..9e2ea571c 100644
--- a/templates/syslinux/ca/f3.txt.install.g-i
+++ b/templates/syslinux/ca/f3.txt.install.g-i
@@ -4,7 +4,7 @@
0flive07
Inicia el sistema live -- aquest es el mŠtode de LH_MEDIA per defecte.
-0flive-failsafe07
+0flivefailsafe07
Inicia el sistema en mode a prova de falles.
0finstall07 or 0finstallgui07
Inicia la instalaci˘ utilitzant el instalúlador normal o el gr…fic.
diff --git a/templates/syslinux/ca/f3.txt.live b/templates/syslinux/ca/f3.txt.live
index 30efcdd7a..ba8f3c7c7 100644
--- a/templates/syslinux/ca/f3.txt.live
+++ b/templates/syslinux/ca/f3.txt.live
@@ -4,7 +4,7 @@
0flive07
Inicia el sistema live -- aquest es el mŠtode de LH_MEDIA per defecte.
-0flive-failsafe07
+0flivefailsafe07
Inicia el sistema en mode a prova de falles.
diff --git a/templates/syslinux/en/f3.txt.install b/templates/syslinux/en/f3.txt.install
index 233f267d2..7c58f21d1 100644
--- a/templates/syslinux/en/f3.txt.install
+++ b/templates/syslinux/en/f3.txt.install
@@ -4,7 +4,7 @@
0flive07
Start the live system -- this is the default LH_MEDIA method.
-0flive-failsafe07
+0flivefailsafe07
Start the live system in fail-safe mode.
0finstall07
Start the installation.
diff --git a/templates/syslinux/en/f3.txt.install.g-i b/templates/syslinux/en/f3.txt.install.g-i
index 745685d30..e789d4942 100644
--- a/templates/syslinux/en/f3.txt.install.g-i
+++ b/templates/syslinux/en/f3.txt.install.g-i
@@ -4,7 +4,7 @@
0flive07
Start the live system -- this is the default LH_MEDIA method.
-0flive-failsafe07
+0flivefailsafe07
Start the live system in fail-safe mode.
0finstall07 or 0finstallgui07
Start the installation using the normal or graphical installer.
diff --git a/templates/syslinux/en/f3.txt.live b/templates/syslinux/en/f3.txt.live
index b48ab8d08..29437ed0f 100644
--- a/templates/syslinux/en/f3.txt.live
+++ b/templates/syslinux/en/f3.txt.live
@@ -4,7 +4,7 @@
0flive07
Start the live system -- this is the default LH_MEDIA method.
-0flive-failsafe07
+0flivefailsafe07
Start the live system in fail-safe mode.
diff --git a/templates/syslinux/es/f3.txt.install b/templates/syslinux/es/f3.txt.install
index 5587787e5..1171aeda2 100644
--- a/templates/syslinux/es/f3.txt.install
+++ b/templates/syslinux/es/f3.txt.install
@@ -4,7 +4,7 @@
0flive07
Inicia el sistema live -- ‚ste es el sistema en LH_MEDIA predeterminado.
-0flive-failsafe07
+0flivefailsafe07
Inicia el sistema live en modo a prueba de fallos.
0finstall07
Inicia la instalaci˘n.
diff --git a/templates/syslinux/es/f3.txt.install.g-i b/templates/syslinux/es/f3.txt.install.g-i
index 29ff67acb..b194699a2 100644
--- a/templates/syslinux/es/f3.txt.install.g-i
+++ b/templates/syslinux/es/f3.txt.install.g-i
@@ -4,7 +4,7 @@
0flive07
Inicia el sistema live -- ‚ste es el sistema en LH_MEDIA por defecto.
-0flive-failsafe07
+0flivefailsafe07
Inicia el sistema live en modo a prueba de fallos.
0finstall07 or 0finstallgui07
Inicia la instalaci˘n usando el instalador normal o el gr fico.
diff --git a/templates/syslinux/es/f3.txt.live b/templates/syslinux/es/f3.txt.live
index 7789f14f4..4c5aab669 100644
--- a/templates/syslinux/es/f3.txt.live
+++ b/templates/syslinux/es/f3.txt.live
@@ -4,7 +4,7 @@
0flive07
Inicia el sistema live -- ‚ste es el sistema en LH_MEDIA por defecto.
-0flive-failsafe07
+0flivefailsafe07
Inicia el sistema live en modo a prueba de fallos.