[SCM] debian-live/live-helper branch, master, updated. 1.0_a34-1-9-g7cacae2

[Daniel Baumann]

The branch, master has been updated
       via  7cacae2d940e17a7627413bc934ea198de0ab486 (commit)
      from  27e3585e7a6b3596ad6608615b8320e51fd7ae5e (commit)


- Shortlog ------------------------------------------------------------
7cacae2 Renaming live-failsafe boot target to livefailsafe (Closes: #450576).

Summary of changes:
 helpers/lh_binary_syslinux               |    2 +-
 templates/syslinux/ca/f3.txt.install     |    2 +-
 templates/syslinux/ca/f3.txt.install.g-i |    2 +-
 templates/syslinux/ca/f3.txt.live        |    2 +-
 templates/syslinux/en/f3.txt.install     |    2 +-
 templates/syslinux/en/f3.txt.install.g-i |    2 +-
 templates/syslinux/en/f3.txt.live        |    2 +-
 templates/syslinux/es/f3.txt.install     |    2 +-
 templates/syslinux/es/f3.txt.install.g-i |    2 +-
 templates/syslinux/es/f3.txt.live        |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 7cacae2d940e17a7627413bc934ea198de0ab486
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Nov 10 15:23:27 2007 +0100

    Renaming live-failsafe boot target to livefailsafe (Closes: #450576).

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 109f96d..afae512 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 85c68a9..c403023 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 461d77c..9e2ea57 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 30efcdd..ba8f3c7 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 233f267..7c58f21 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 745685d..e789d49 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 b48ab8d..29437ed 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 5587787..1171aed 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 29ff67a..b194699 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 7789f14..4c5aab6 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.
 
 

-- 
debian-live/live-helper