[SCM] debian-live/live-helper branch, master, updated. 1.0_a37-2-31-g97cc585

Chris Lamb chris at chris-lamb.co.uk
Tue Jan 15 20:25:09 UTC 2008 

The branch, master has been updated
       via  97cc5853ca0956240d7c1c7a86a24173e037690f (commit)
       via  2ae4b3bf37fe7c8cc77cf2ceb16c791ff134022b (commit)
       via  c84e3c096b526425a85b9dcc68af66274b7bffe7 (commit)
       via  73acaf73d3539471b0270a5c54b59a245b5fd85b (commit)
       via  1f436f74835771e6a695fdb93f4dd31fbc38a13a (commit)
      from  948730f93a1a767fafb46c31845864538359e33c (commit)


- Shortlog ------------------------------------------------------------
97cc585 Remove trailing newline from syslinux splash screens. (Closes: #457740)
2ae4b3b Re-order hooks such that local hooks are executed first. (Closes: #453360)
c84e3c0 Re-add guards against bogus 'for' shell expansion.
73acaf7 Refactor d-i udeb handling with better failure mode (Closes: #444565)
1f436f7 Use Install_file for udebs.

Summary of changes:
 helpers/lh_binary_debian-installer       |   78 ++++++++++++++---------------
 helpers/lh_chroot                        |    2 +-
 templates/syslinux/ca/boot.txt           |    2 +-
 templates/syslinux/ca/f1.txt.install     |    3 +-
 templates/syslinux/ca/f1.txt.live        |    3 +-
 templates/syslinux/ca/f10.txt            |    3 +-
 templates/syslinux/ca/f2.txt.install     |    3 +-
 templates/syslinux/ca/f2.txt.live        |    3 +-
 templates/syslinux/ca/f3.txt.install     |    3 +-
 templates/syslinux/ca/f3.txt.install.g-i |    3 +-
 templates/syslinux/ca/f3.txt.live        |    3 +-
 templates/syslinux/ca/f4.txt.install     |    3 +-
 templates/syslinux/ca/f4.txt.install.g-i |    3 +-
 templates/syslinux/ca/f4.txt.live        |    3 +-
 templates/syslinux/ca/f5.txt             |    3 +-
 templates/syslinux/ca/f6.txt             |    3 +-
 templates/syslinux/ca/f7.txt             |    3 +-
 templates/syslinux/ca/f8.txt.install     |    3 +-
 templates/syslinux/ca/f8.txt.live        |    3 +-
 templates/syslinux/ca/f9.txt.install     |    3 +-
 templates/syslinux/ca/f9.txt.live        |    3 +-
 templates/syslinux/en/boot.txt           |    2 +-
 templates/syslinux/en/f1.txt.install     |    3 +-
 templates/syslinux/en/f1.txt.live        |    3 +-
 templates/syslinux/en/f10.txt            |    3 +-
 templates/syslinux/en/f2.txt.install     |    3 +-
 templates/syslinux/en/f3.txt.install     |    3 +-
 templates/syslinux/en/f3.txt.install.g-i |    3 +-
 templates/syslinux/en/f3.txt.live        |    3 +-
 templates/syslinux/en/f4.txt.install     |    3 +-
 templates/syslinux/en/f4.txt.live        |    3 +-
 templates/syslinux/en/f5.txt             |    3 +-
 templates/syslinux/en/f6.txt             |    3 +-
 templates/syslinux/en/f7.txt             |    3 +-
 templates/syslinux/en/f8.txt.live        |    3 +-
 templates/syslinux/en/f9.txt.install     |    3 +-
 templates/syslinux/en/f9.txt.live        |    3 +-
 templates/syslinux/es/boot.txt           |    2 +-
 templates/syslinux/es/f1.txt.install     |    3 +-
 templates/syslinux/es/f1.txt.live        |    3 +-
 templates/syslinux/es/f10.txt            |    3 +-
 templates/syslinux/es/f2.txt.install     |    3 +-
 templates/syslinux/es/f2.txt.live        |    3 +-
 templates/syslinux/es/f3.txt.install     |    3 +-
 templates/syslinux/es/f3.txt.install.g-i |    3 +-
 templates/syslinux/es/f3.txt.live        |    3 +-
 templates/syslinux/es/f4.txt.install     |    3 +-
 templates/syslinux/es/f4.txt.install.g-i |    3 +-
 templates/syslinux/es/f4.txt.live        |    1 +
 templates/syslinux/es/f5.txt             |    3 +-
 templates/syslinux/es/f6.txt             |    3 +-
 templates/syslinux/es/f7.txt             |    3 +-
 templates/syslinux/es/f8.txt.install     |    3 +-
 templates/syslinux/es/f8.txt.live        |    3 +-
 templates/syslinux/es/f9.txt.install     |    3 +-
 templates/syslinux/es/f9.txt.live        |    3 +-
 56 files changed, 143 insertions(+), 94 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 97cc5853ca0956240d7c1c7a86a24173e037690f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Jan 15 20:01:41 2008 +0000

    Remove trailing newline from syslinux splash screens. (Closes: #457740)
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/templates/syslinux/ca/boot.txt b/templates/syslinux/ca/boot.txt
index 095a0a4..d1f69d4 100644
--- a/templates/syslinux/ca/boot.txt
+++ b/templates/syslinux/ca/boot.txt
@@ -1,3 +1,3 @@
 {$SPLASH}
 
-Premeu  F1 i control, i llavors el 1 per obtenir ajuda, o INTRO per fer el 
+Premeu  F1 i control, i llavors el 1 per obtenir ajuda, o INTRO per fer el 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f1.txt.install b/templates/syslinux/ca/f1.txt.install
index 0a49d8d..89b0aaa 100644
--- a/templates/syslinux/ca/f1.txt.install
+++ b/templates/syslinux/ca/f1.txt.install
@@ -22,4 +22,5 @@ Per a F1-F9 premeu control amb F i llavors el nombre 1-9
 Per a F10 premeu control amb F i llavors el nombre 0
 
 
-Premeu F2 a F10 per m‚s detalls, o INTRO per fer el 
+
+Premeu F2 a F10 per m‚s detalls, o INTRO per fer el 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f1.txt.live b/templates/syslinux/ca/f1.txt.live
index c314f28..327dd0f 100644
--- a/templates/syslinux/ca/f1.txt.live
+++ b/templates/syslinux/ca/f1.txt.live
@@ -22,4 +22,5 @@ Per a F1-F9 premeu control amb F i llavors el nombre 1-9
 Per a F10 premeu control amb F i llavors el nombre 0
 
 
-Premeu F2 a F10 per m‚s detalls, o INTRO per fer el 
+
+Premeu F2 a F10 per m‚s detalls, o INTRO per fer el 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f10.txt b/templates/syslinux/ca/f10.txt
index 0ba1b17..6071a9e 100644
--- a/templates/syslinux/ca/f10.txt
+++ b/templates/syslinux/ca/f10.txt
@@ -20,4 +20,5 @@ M‚s informaci¢ del projecte Debian Live es pot trobar a
 
 
 
-Preneu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
+
+Preneu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f2.txt.install b/templates/syslinux/ca/f2.txt.install
index 37eb76f..26e9733 100644
--- a/templates/syslinux/ca/f2.txt.install
+++ b/templates/syslinux/ca/f2.txt.install
@@ -20,4 +20,5 @@ Gr…cies per seleccionar Debian!
 
 
 
-Preneu F1control i F i llavors 1 per veure  el men£ d'ajuda, o ENTER per a 
+
+Preneu F1control i F i llavors 1 per veure  el men£ d'ajuda, o ENTER per a 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f2.txt.live b/templates/syslinux/ca/f2.txt.live
index bf62941..aa6097b 100644
--- a/templates/syslinux/ca/f2.txt.live
+++ b/templates/syslinux/ca/f2.txt.live
@@ -20,4 +20,5 @@ Gr…cies per seleccionar Debian!
 
 
 
-Preneu F1control i F, i llavors 1 per veure  el men£ d'ajuda, o ENTER per a 
+
+Preneu F1control i F, i llavors 1 per veure  el men£ d'ajuda, o ENTER per a 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f3.txt.install b/templates/syslinux/ca/f3.txt.install
index c403023..eb04eb1 100644
--- a/templates/syslinux/ca/f3.txt.install
+++ b/templates/syslinux/ca/f3.txt.install
@@ -20,4 +20,5 @@ prenent simplement la tecla ENTER a l'indicador d'ordres.
 
 Excepte en el mode d'experts, els missatges d'arrancada seran suprimits.
 
-Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
+
+Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f3.txt.install.g-i b/templates/syslinux/ca/f3.txt.install.g-i
index 9e2ea57..294892e 100644
--- a/templates/syslinux/ca/f3.txt.install.g-i
+++ b/templates/syslinux/ca/f3.txt.install.g-i
@@ -20,4 +20,5 @@ prenent simplement la tecla ENTER a l'indicador d'ordres.
 
 Excepte en el mode d'experts, els missatges d'arrancada seran suprimits.
 
-Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
+
+Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f3.txt.live b/templates/syslinux/ca/f3.txt.live
index ba8f3c7..c1daee4 100644
--- a/templates/syslinux/ca/f3.txt.live
+++ b/templates/syslinux/ca/f3.txt.live
@@ -20,4 +20,5 @@ seguit opcionalment dels par…metres que convinguin. Per exemple:
 Si dubteu, haur¡eu d'usar el mŠtode per defecte, sense cap par…metre especial,
 prenent simplement la tecla ENTER a l'indicador d'ordres.
 
-Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a
+
+Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a
\ No newline at end of file
diff --git a/templates/syslinux/ca/f4.txt.install b/templates/syslinux/ca/f4.txt.install
index 6f69a58..d28ea3c 100644
--- a/templates/syslinux/ca/f4.txt.install
+++ b/templates/syslinux/ca/f4.txt.install
@@ -20,4 +20,5 @@ seguit opcionalment dels par…metres que convinguin. Per exemple:
 
 
 
-Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
+
+Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f4.txt.install.g-i b/templates/syslinux/ca/f4.txt.install.g-i
index 5f0492d..6ca4bc9 100644
--- a/templates/syslinux/ca/f4.txt.install.g-i
+++ b/templates/syslinux/ca/f4.txt.install.g-i
@@ -22,4 +22,5 @@ seguit opcionalment dels par…metres que convinguin. Per exemple:
 
 
 
-Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
+
+Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f4.txt.live b/templates/syslinux/ca/f4.txt.live
index 2899a4a..edf5622 100644
--- a/templates/syslinux/ca/f4.txt.live
+++ b/templates/syslinux/ca/f4.txt.live
@@ -20,4 +20,5 @@
 
 
 
-Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
+
+Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f5.txt b/templates/syslinux/ca/f5.txt
index 86b01e1..dd946dc 100644
--- a/templates/syslinux/ca/f5.txt
+++ b/templates/syslinux/ca/f5.txt
@@ -20,4 +20,5 @@ segent forma m•dul.par…metre=valor, per exemple: libata.atapi_enabled=1
 
 
 
-Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
+
+Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f6.txt b/templates/syslinux/ca/f6.txt
index aef3e1c..a46faa6 100644
--- a/templates/syslinux/ca/f6.txt
+++ b/templates/syslinux/ca/f6.txt
@@ -20,4 +20,5 @@ Desactivar l'USB                         0fnousb07
 Per exemple:
   boot: install vga=771 noapic nolapic
 
-Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
+
+Preneu F1control i F, i llavors 1 per veure el men£ d'ajuda, o ENTER per a 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f7.txt b/templates/syslinux/ca/f7.txt
index 2f9c3f2..53e406f 100644
--- a/templates/syslinux/ca/f7.txt
+++ b/templates/syslinux/ca/f7.txt
@@ -20,4 +20,5 @@ per a m‚s informaci¢.
 Per exemple:
   boot: install aic7xxx.aic7xxx=no_probe
 
-Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
+
+Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f8.txt.install b/templates/syslinux/ca/f8.txt.install
index 8be5140..d1eddf8 100644
--- a/templates/syslinux/ca/f8.txt.install
+++ b/templates/syslinux/ca/f8.txt.install
@@ -20,4 +20,5 @@ Determina labors especials                      0ftasks="kde-desktop, standard"
 Per exemple:
   boot: install fb=false
 
-Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
+
+Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f8.txt.live b/templates/syslinux/ca/f8.txt.live
index 4bdc2e2..caed886 100644
--- a/templates/syslinux/ca/f8.txt.live
+++ b/templates/syslinux/ca/f8.txt.live
@@ -20,4 +20,5 @@
 
 
 
-Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
+
+Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f9.txt.install b/templates/syslinux/ca/f9.txt.install
index 53e0807..2bbfe91 100644
--- a/templates/syslinux/ca/f9.txt.install
+++ b/templates/syslinux/ca/f9.txt.install
@@ -20,4 +20,5 @@ en la web de Debian, 0fhttp://debian-live.alioth.debian.org/07
 
 
 
-Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
+
+Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
\ No newline at end of file
diff --git a/templates/syslinux/ca/f9.txt.live b/templates/syslinux/ca/f9.txt.live
index a272f81..ceb3170 100644
--- a/templates/syslinux/ca/f9.txt.live
+++ b/templates/syslinux/ca/f9.txt.live
@@ -20,4 +20,5 @@ Aquests documents estan disponibles al lloc web de Debian:
 
 
 
-Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
+
+Premeu F1control i F seguit de 1 per el men£ d'ajuda, o INTRO per fer el 
\ No newline at end of file
diff --git a/templates/syslinux/en/boot.txt b/templates/syslinux/en/boot.txt
index ecb5dfc..94e73e6 100644
--- a/templates/syslinux/en/boot.txt
+++ b/templates/syslinux/en/boot.txt
@@ -1,3 +1,3 @@
 {$SPLASH}
 
-Press F1control and F then 1 for help, or ENTER to 
+Press F1control and F then 1 for help, or ENTER to 
\ No newline at end of file
diff --git a/templates/syslinux/en/f1.txt.install b/templates/syslinux/en/f1.txt.install
index f49f549..3d3965f 100644
--- a/templates/syslinux/en/f1.txt.install
+++ b/templates/syslinux/en/f1.txt.install
@@ -22,4 +22,5 @@ For F1-F9 type control and F then the digit 1-9
 For F10 type control and F then the digit 0
 
 
-Press F2 through F10 for details, or ENTER to 
+
+Press F2 through F10 for details, or ENTER to 
\ No newline at end of file
diff --git a/templates/syslinux/en/f1.txt.live b/templates/syslinux/en/f1.txt.live
index de32d52..8c550e0 100644
--- a/templates/syslinux/en/f1.txt.live
+++ b/templates/syslinux/en/f1.txt.live
@@ -22,4 +22,5 @@ For F1-F9 type control and F then the digit 1-9
 For F10 type control and F then the digit 0
 
 
-Press F2 through F10 for details, or ENTER to 
+
+Press F2 through F10 for details, or ENTER to 
\ No newline at end of file
diff --git a/templates/syslinux/en/f10.txt b/templates/syslinux/en/f10.txt
index 3cf379e..8652bcf 100644
--- a/templates/syslinux/en/f10.txt
+++ b/templates/syslinux/en/f10.txt
@@ -20,4 +20,5 @@ More information about the Debian Live project can be found at
 
 
 
-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/f2.txt.install b/templates/syslinux/en/f2.txt.install
index 12c0b22..e4f2208 100644
--- a/templates/syslinux/en/f2.txt.install
+++ b/templates/syslinux/en/f2.txt.install
@@ -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/f3.txt.install b/templates/syslinux/en/f3.txt.install
index 7c58f21..fdce03c 100644
--- a/templates/syslinux/en/f3.txt.install
+++ b/templates/syslinux/en/f3.txt.install
@@ -20,4 +20,5 @@ parameters, by simply pressing enter at the boot prompt.
 
 Except in expert mode, non-critical kernel boot messages are suppressed.
 
-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/f3.txt.install.g-i b/templates/syslinux/en/f3.txt.install.g-i
index e789d49..25b1949 100644
--- a/templates/syslinux/en/f3.txt.install.g-i
+++ b/templates/syslinux/en/f3.txt.install.g-i
@@ -20,4 +20,5 @@ parameters, by simply pressing enter at the boot prompt.
 
 Except in expert mode, non-critical kernel boot messages are suppressed.
 
-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/f3.txt.live b/templates/syslinux/en/f3.txt.live
index 29437ed..cc887cc 100644
--- a/templates/syslinux/en/f3.txt.live
+++ b/templates/syslinux/en/f3.txt.live
@@ -20,4 +20,5 @@ followed by any boot parameters. For example:
 If unsure, you should use the default boot method, with no special
 parameters, by simply pressing enter at the boot prompt.
 
-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.install b/templates/syslinux/en/f4.txt.install
index 106c30e..1a74cce 100644
--- a/templates/syslinux/en/f4.txt.install
+++ b/templates/syslinux/en/f4.txt.install
@@ -20,4 +20,5 @@ followed by any boot parameters. For example:
 
 
 
-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 6a76aca..52f5e8d 100644
--- a/templates/syslinux/en/f4.txt.live
+++ b/templates/syslinux/en/f4.txt.live
@@ -20,4 +20,5 @@
 
 
 
-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/f5.txt b/templates/syslinux/en/f5.txt
index 58bbb94..7d01b24 100644
--- a/templates/syslinux/en/f5.txt
+++ b/templates/syslinux/en/f5.txt
@@ -20,4 +20,5 @@ module.param=value, for example: libata.atapi_enabled=1
 
 
 
-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/f6.txt b/templates/syslinux/en/f6.txt
index 772fd50..5ef45e2 100644
--- a/templates/syslinux/en/f6.txt
+++ b/templates/syslinux/en/f6.txt
@@ -20,4 +20,5 @@ disable USB                            0fnousb07
 For example:
   boot: install vga=771 noapic nolapic
 
-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/f7.txt b/templates/syslinux/en/f7.txt
index 58ee463..12740c5 100644
--- a/templates/syslinux/en/f7.txt
+++ b/templates/syslinux/en/f7.txt
@@ -20,4 +20,5 @@ for more.
 For example:
   boot: install aic7xxx.aic7xxx=no_probe
 
-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/f8.txt.live b/templates/syslinux/en/f8.txt.live
index 3dfc3e5..d785f54 100644
--- a/templates/syslinux/en/f8.txt.live
+++ b/templates/syslinux/en/f8.txt.live
@@ -20,4 +20,5 @@
 
 
 
-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/f9.txt.install b/templates/syslinux/en/f9.txt.install
index dd7bc2a..174284a 100644
--- a/templates/syslinux/en/f9.txt.install
+++ b/templates/syslinux/en/f9.txt.install
@@ -20,4 +20,5 @@ the Debian web site, 0fhttp://debian-live.alioth.debian.org/07
 
 
 
-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/f9.txt.live b/templates/syslinux/en/f9.txt.live
index 5b8e8af..cab7f20 100644
--- a/templates/syslinux/en/f9.txt.live
+++ b/templates/syslinux/en/f9.txt.live
@@ -20,4 +20,5 @@ documents are available at the Debian web site,
 
 
 
-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/es/boot.txt b/templates/syslinux/es/boot.txt
index 55b3b2e..b86ed98 100644
--- a/templates/syslinux/es/boot.txt
+++ b/templates/syslinux/es/boot.txt
@@ -1,3 +1,3 @@
 {$SPLASH}
 
-Pulse F1control y F, y entonces 1 para obtener ayuda, o INTRO para 
+Pulse F1control y F, y entonces 1 para obtener ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f1.txt.install b/templates/syslinux/es/f1.txt.install
index 326dc7e..eb84626 100644
--- a/templates/syslinux/es/f1.txt.install
+++ b/templates/syslinux/es/f1.txt.install
@@ -22,4 +22,5 @@ Para las teclas F1-F9 pulse control y F y despu‚s el d¡gito 1-9
 Para F10 pulse control y F y el d¡gito 0
 
 
-Pulse de F2 a F10 para obtener m s detalles, o INTRO para 
+
+Pulse de F2 a F10 para obtener m s detalles, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f1.txt.live b/templates/syslinux/es/f1.txt.live
index 911c618..3e603e4 100644
--- a/templates/syslinux/es/f1.txt.live
+++ b/templates/syslinux/es/f1.txt.live
@@ -22,4 +22,5 @@ Para las teclas F1-F9 pulse control y F y despu‚s el d¡gito 1-9
 Para F10 pulse control y F y el d¡gito 0
 
 
-Pulse de F2 a F10 para obtener m s detalles, o INTRO para 
+
+Pulse de F2 a F10 para obtener m s detalles, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f10.txt b/templates/syslinux/es/f10.txt
index a702aa5..22f5e78 100644
--- a/templates/syslinux/es/f10.txt
+++ b/templates/syslinux/es/f10.txt
@@ -20,4 +20,5 @@ M s informaci¢n en sobre el proyecto Debian Live puede encontrarse en
 
 
 
-Pulse F1control y F, y entonces 1 para obtener ayuda, o INTRO para 
+
+Pulse F1control y F, y entonces 1 para obtener ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f2.txt.install b/templates/syslinux/es/f2.txt.install
index eec469a..eef62ad 100644
--- a/templates/syslinux/es/f2.txt.install
+++ b/templates/syslinux/es/f2.txt.install
@@ -20,4 +20,5 @@ documentos est n disponibles en la web de Debian, 0fhttp://www.debian.org/07
 
 
 
-Pulse F1control y F y entonces 1 para el men£ de ayuda, o INTRO para 
+
+Pulse F1control y F y entonces 1 para el men£ de ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f2.txt.live b/templates/syslinux/es/f2.txt.live
index 22578e8..ecb2e13 100644
--- a/templates/syslinux/es/f2.txt.live
+++ b/templates/syslinux/es/f2.txt.live
@@ -20,4 +20,5 @@ disponibles en la web de Debian, 0fhttp://debian-live.alioth.debian.org/07
 
 
 
-Pulse F1control y F y entonces 1 para el men£ de ayuda, o INTRO para  
+
+Pulse F1control y F y entonces 1 para el men£ de ayuda, o INTRO para  
\ No newline at end of file
diff --git a/templates/syslinux/es/f3.txt.install b/templates/syslinux/es/f3.txt.install
index 1171aed..4467c99 100644
--- a/templates/syslinux/es/f3.txt.install
+++ b/templates/syslinux/es/f3.txt.install
@@ -20,4 +20,5 @@ especial, pulsando simplemente la tecla INTRO en el indicador de ¢rdenes.
 
 Excepto en el modo experto, no se mostrar n los mensajes no cr¡ticos.
 
-Pulse F1control y F, y luego 1 para ver el men£ de ayuda, o INTRO para 
+
+Pulse F1control y F, y luego 1 para ver el men£ de ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f3.txt.install.g-i b/templates/syslinux/es/f3.txt.install.g-i
index b194699..f4c1dc1 100644
--- a/templates/syslinux/es/f3.txt.install.g-i
+++ b/templates/syslinux/es/f3.txt.install.g-i
@@ -20,4 +20,5 @@ especial, pulsando simplemente la tecla INTRO en el indicador de ¢rdenes.
 
 Excepto en el modo experto, no se mostrar n los mensajes no cr¡ticos.
 
-Pulse F1control y F, y luego 1 para ver el men£ de ayuda, o INTRO para 
+
+Pulse F1control y F, y luego 1 para ver el men£ de ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f3.txt.live b/templates/syslinux/es/f3.txt.live
index 4c5aab6..73660f9 100644
--- a/templates/syslinux/es/f3.txt.live
+++ b/templates/syslinux/es/f3.txt.live
@@ -20,4 +20,5 @@ seguido opcionalmente por uno de los par metros de arranque. Por ejemplo:
 Si duda, deber¡a usar el m‚todo predeterminado, sin ning£n par metro 
 especial, pulsando simplemente la tecla INTRO en el indicador de ¢rdenes.
 
-Pulse F1control y F, y luego 1 para ver el men£ de ayuda, o INTRO para 
+
+Pulse F1control y F, y luego 1 para ver el men£ de ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f4.txt.install b/templates/syslinux/es/f4.txt.install
index 0510aa0..321d9be 100644
--- a/templates/syslinux/es/f4.txt.install
+++ b/templates/syslinux/es/f4.txt.install
@@ -20,4 +20,5 @@ seguido opcionalmente por uno de los par metros de arranque. Por ejemplo:
 
 
 
-Pulse F1control y F, y luego 1 para ver el men£ de ayuda, o INTRO para 
+
+Pulse F1control y F, y luego 1 para ver el men£ de ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f4.txt.install.g-i b/templates/syslinux/es/f4.txt.install.g-i
index 4650d50..1a717f1 100644
--- a/templates/syslinux/es/f4.txt.install.g-i
+++ b/templates/syslinux/es/f4.txt.install.g-i
@@ -20,4 +20,5 @@ seguido opcionalmente por uno de los par metros de arranque. Por ejemplo:
 
 
 
-Pulse F1control y F, y luego 1 para ver el ¡ndice de ayuda, o INTRO para 
+
+Pulse F1control y F, y luego 1 para ver el ¡ndice de ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f4.txt.live b/templates/syslinux/es/f4.txt.live
index 71a56f6..c428f86 100644
--- a/templates/syslinux/es/f4.txt.live
+++ b/templates/syslinux/es/f4.txt.live
@@ -20,4 +20,5 @@
 
 
 
+
 Pulse F1control y F, y luego 1 para ver el men£ de ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f5.txt b/templates/syslinux/es/f5.txt
index e6c1f9d..107019c 100644
--- a/templates/syslinux/es/f5.txt
+++ b/templates/syslinux/es/f5.txt
@@ -20,4 +20,5 @@ Por ejemplo: libata.atapi_enabled=1
 
 
 
-Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para 
+
+Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f6.txt b/templates/syslinux/es/f6.txt
index f4b4b1d..15e1bb8 100644
--- a/templates/syslinux/es/f6.txt
+++ b/templates/syslinux/es/f6.txt
@@ -20,4 +20,5 @@ Desactivar USB                             0fnousb07
 Por ejemplo:
   boot: install vga=771 noapic nolapic
 
-Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para 
+
+Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f7.txt b/templates/syslinux/es/f7.txt
index fcedbec..a3dfe2a 100644
--- a/templates/syslinux/es/f7.txt
+++ b/templates/syslinux/es/f7.txt
@@ -20,4 +20,5 @@ el fichero kernel-parameters.txt de las fuentes del n£cleo.
 Por ejemplo:
   boot: install aic7xxx.aic7xxx=no_probe
 
-Pulse F1control y F, y entonces 1 para obtener ayuda, o INTRO para 
+
+Pulse F1control y F, y entonces 1 para obtener ayuda, o INTRO para 
\ No newline at end of file
diff --git a/templates/syslinux/es/f8.txt.install b/templates/syslinux/es/f8.txt.install
index c87fab4..2828f23 100644
--- a/templates/syslinux/es/f8.txt.install
+++ b/templates/syslinux/es/f8.txt.install
@@ -20,4 +20,5 @@ Determina tareas especiales                   0ftasks="kde-desktop, standard"0
 Por ejemplo:
   boot: install fb=false
 
-Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para el
+
+Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para el
\ No newline at end of file
diff --git a/templates/syslinux/es/f8.txt.live b/templates/syslinux/es/f8.txt.live
index f59c8e9..65f21cc 100644
--- a/templates/syslinux/es/f8.txt.live
+++ b/templates/syslinux/es/f8.txt.live
@@ -20,4 +20,5 @@
 
 
 
-Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para el 
+
+Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para el 
\ No newline at end of file
diff --git a/templates/syslinux/es/f9.txt.install b/templates/syslinux/es/f9.txt.install
index 153b512..aba63cf 100644
--- a/templates/syslinux/es/f9.txt.install
+++ b/templates/syslinux/es/f9.txt.install
@@ -20,4 +20,5 @@ la web de Debian, 0fhttp://debian-live.alioth.debian.org/07
 
 
 
-Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para el
+
+Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para el
\ No newline at end of file
diff --git a/templates/syslinux/es/f9.txt.live b/templates/syslinux/es/f9.txt.live
index 63ce167..113b50e 100644
--- a/templates/syslinux/es/f9.txt.live
+++ b/templates/syslinux/es/f9.txt.live
@@ -20,4 +20,5 @@ estos documentos est n disponibles en la web de Debian:
 
 
 
-Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para el
+
+Pulse F1control y F, y entonces 1 para ver el men£ de ayuda, o INTRO para el
\ No newline at end of file

commit 2ae4b3bf37fe7c8cc77cf2ceb16c791ff134022b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Jan 15 19:51:37 2008 +0000

    Re-order hooks such that local hooks are executed first. (Closes: #453360)
    
    Some non-local hooks clean the chroot too much, resulting in the
    local hooks having to perform identical clean-up tasks (for example,
    downloading a package).
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index c8502bd..1913eb0 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -59,8 +59,8 @@ lh_chroot_local-packages ${*}
 lh_chroot_localization ${*}
 lh_chroot_local-includes ${*}
 lh_chroot_sysvinit ${*}
-lh_chroot_hooks ${*}
 lh_chroot_local-hooks ${*}
+lh_chroot_hooks ${*}
 lh_chroot_symlinks ${*}
 lh_chroot_hacks ${*}
 lh_chroot_interactive ${*}

commit c84e3c096b526425a85b9dcc68af66274b7bffe7
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Jan 15 19:47:50 2008 +0000

    Re-add guards against bogus 'for' shell expansion.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 4b36ffa..096ca47 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -254,10 +254,13 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
 	mv chroot/binary.deb ./
 	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
 	
-	for FILE in binary.deb/archives/*.deb
-	do
-		Install_file "${FILE}" "binary/pool/main"
-	done
+	if ls binary.deb/archives/*.deb > /dev/null 2>&1
+	then
+		for FILE in binary.deb/archives/*.deb
+		do
+			Install_file "${FILE}" "binary/pool/main"
+		done
+	fi
 fi
 
 # Including base debian packages
@@ -273,15 +276,21 @@ else
 fi
 
 # Including local debs
-for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
-do
-	Install_file "${FILE}" "binary/pool/main"
-done
+if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".udeb > /dev/null 2>&1
+then
+	for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
+	do
+		Install_file "${FILE}" "binary/pool/main"
+	done
+fi
 
-for FILE in ../config/binary_local-debs/*_all.deb
-do
-	Install_file "${FILE}" "binary/pool/main"
-done
+if ls ../config/binary_local-debs/*_all.udeb > /dev/null 2>&1
+then
+	for FILE in ../config/binary_local-debs/*_all.deb
+	do
+		Install_file "${FILE}" "binary/pool/main"
+	done
+fi
 
 # Generating deb indices
 mkdir -p binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}

commit 73acaf73d3539471b0270a5c54b59a245b5fd85b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Jan 15 19:45:07 2008 +0000

    Refactor d-i udeb handling with better failure mode (Closes: #444565)
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 9522bab..4b36ffa 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -323,9 +323,9 @@ mkdir -p ../cache/packages_debian-installer.udeb
 cp *.udeb ../cache/packages_debian-installer.udeb
 
 # Including local udebs
-if ls ../config/binary_local-udebs/*.udeb > /dev/null 2>&1
+if ls ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb > /dev/null 2>&1
 then
-	for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb ../config/binary_local-udebs/*_all.udeb
+	for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb
 	do
 		Install_file "${FILE}" "pool/main"
 
@@ -333,7 +333,16 @@ then
 		rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
 	done
 fi
+if ls ../config/binary_local-udebs/*_all.udeb > /dev/null 2>&1
+then
+	for FILE in ../config/binary_local-udebs/*_all.udeb
+	do
+		Install_file "${FILE}" "pool/main"
 
+		# Prefer local udebs over downloaded udebs
+		rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
+	done
+fi
 # Excluding udebs
 grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/udeb_exclude > exclude
 grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs >> exclude

commit 1f436f74835771e6a695fdb93f4dd31fbc38a13a
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Jan 15 19:42:28 2008 +0000

    Use Install_file for udebs.

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 050f48f..9522bab 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -113,6 +113,7 @@ DESTDIR_GI="${DESTDIR}/gtk"
 
 Install_file() {
 	local FILE="${1}"
+	local TARGET="${2}"
 
 	SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
 
@@ -132,10 +133,10 @@ Install_file() {
 	esac
 
 	# Install directory
-	mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+	mkdir -p "${TARGET}"/"${LETTER}"/"${SOURCE}"
 
 	# Move files
-	cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+	cp "${FILE}" "${TARGET}"/"${LETTER}"/"${SOURCE}"
 }
 
 # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
@@ -255,7 +256,7 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
 	
 	for FILE in binary.deb/archives/*.deb
 	do
-		Install_file "${FILE}"
+		Install_file "${FILE}" "binary/pool/main"
 	done
 fi
 
@@ -264,7 +265,7 @@ if [ -d cache/packages_bootstrap ]
 then
 	for FILE in cache/packages_bootstrap/*.deb
 	do
-		Install_file "${FILE}"
+		Install_file "${FILE}" "binary/pool/main"
 	done
 else
 	Echo_error "E: Could not find cache/packages_bootstrap"
@@ -274,12 +275,12 @@ fi
 # Including local debs
 for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
 do
-	Install_file "${FILE}"
+	Install_file "${FILE}" "binary/pool/main"
 done
 
 for FILE in ../config/binary_local-debs/*_all.deb
 do
-	Install_file "${FILE}"
+	Install_file "${FILE}" "binary/pool/main"
 done
 
 # Generating deb indices
@@ -326,30 +327,9 @@ if ls ../config/binary_local-udebs/*.udeb > /dev/null 2>&1
 then
 	for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb ../config/binary_local-udebs/*_all.udeb
 	do
-		SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
+		Install_file "${FILE}" "pool/main"
 
-		if [ -z "${SOURCE}" ]
-		then
-			SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
-		fi
-
-		case "${SOURCE}" in
-			lib?*)
-				LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
-				;;
-
-			*)
-				LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
-				;;
-		esac
-
-		# Install directory
-		mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
-
-		# Copy files
-		cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
-
-		# Prefere local udebs over downloaded udebs
+		# Prefer local udebs over downloaded udebs
 		rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
 	done
 fi

-- 
debian-live/live-helper

More information about the debian-live-changes mailing list