[SCM] live-boot branch, debian-next, updated. debian/3.0_a38-1-10-gcdece4c
Daniel Baumann
daniel at debian.org
Tue Aug 14 18:48:54 UTC 2012
The following commit has been merged in the debian-next branch:
commit cdece4c8e50051e790d657b1ff9f090ed4737907
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Aug 14 20:48:41 2012 +0200
Using /etc/live/boot/*.conf instead of /etc/live/boot.d/*.conf and /live/image/live/boot/*.conf instead of /live/image/live/boot.d/*.conf for consistency reasons.
diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 86ef117..00da049 100755
--- a/backends/initramfs-tools/live.hook
+++ b/backends/initramfs-tools/live.hook
@@ -12,9 +12,9 @@ then
. /etc/live/boot.conf
fi
-if ls /etc/live/boot.d/*.conf > /dev/null 2>&1
+if ls /etc/live/boot/* > /dev/null 2>&1
then
- for _FILE in /etc/live/boot.d/*.conf
+ for _FILE in /etc/live/boot/*
do
. ${_FILE}
done
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 997aae2..44ca384 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 30.07.2012 3.0~a38\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 14.08.2012 3.0~a38\-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fP \- System Boot Scripts
@@ -41,8 +41,8 @@ see below.
.SS "Configuration Files"
\fBlive\-boot\fP can be configured (but not activated) through configuration
files. Those files can be placed either in the root filesystem itself
-(/etc/live/boot.conf, /etc/live/boot.d/*.conf), or on the live media
-(live/boot.conf, live/boot.d/*.conf).
+(/etc/live/boot.conf, /etc/live/boot/*), or on the live media
+(live/boot.conf, live/boot/*).
.SH OPTIONS
.\" FIXME
@@ -260,9 +260,9 @@ loaded in alphanumeric order.
.SH FILES
.IP \fB/etc/live/boot.conf\fP 4
-.IP \fB/etc/live/boot.d/*.conf\fP 4
+.IP \fB/etc/live/boot/*\fP 4
.IP \fBlive/boot.conf\fP 4
-.IP \fBlive/boot.d/*.conf\fP 4
+.IP \fBlive/boot/*\fP 4
.IP \fBlive\-persistence.conf\fP 4
.SH "SEE ALSO"
diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/live-persistence.conf.de.5
index 69660ee..f8f3066 100644
--- a/manpages/de/live-persistence.conf.de.5
+++ b/manpages/de/live-persistence.conf.de.5
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 30.07.2012 3.0~a38\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 14.08.2012 3.0~a38\-1 "Debian Live Project"
.SH NAME
\fBlive\-persistence.conf\fP \- Configuration file for persistence media in
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 5a25f11..0e5e74f 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-07\-30 3.0~a38-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-08\-14 3.0~a38-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
@@ -23,7 +23,7 @@ To configure the live\-boot parameters used by default in a live image, see the
In addition, there are some more boot parameters to influence the behaviour, see below.
.SS Configuration Files
-\fBlive\-boot\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot.conf, live/boot.d/*.conf).
+\fBlive\-boot\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, live/boot/*).
.SH OPTIONS
\fBlive\-boot\fR currently features the following parameters.
@@ -148,9 +148,9 @@ This optional file (inside the live media) contains a list of white\-space or ca
.SH FILES
.IP "\fB/etc/live/boot.conf\fR" 4
-.IP "\fB/etc/live/boot.d/*.conf\fR" 4
+.IP "\fB/etc/live/boot/*\fR" 4
.IP "\fBlive/boot.conf\fR" 4
-.IP "\fBlive/boot.d/*.conf\fR" 4
+.IP "\fBlive/boot/*\fR" 4
.IP "\fBlive-persistence.conf\fR" 4
.SH SEE ALSO
diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5
index caed34c..5142dc1 100644
--- a/manpages/en/live-persistence.conf.5
+++ b/manpages/en/live-persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-07\-30 3.0~a38-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-08\-14 3.0~a38-1 "Debian Live Project"
.SH NAME
\fBlive-persistence.conf\fR \- Configuration file for persistence media in
diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
index e890632..1d2676c 100644
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 30.07.2012 3.0~a38\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 14.08.2012 3.0~a38\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-boot\fP \- Scripts de Arranque del Sistema
@@ -42,8 +42,8 @@ comportamiento, ver más abajo.
.SS "Ficheros de configuración"
\fBlive\-boot\fP se puede configurar (pero no activar) mediante ficheros de
configuración. Estos ficheros se pueden colocar en el sistema de ficheros
-raíz (/etc/live/boot.conf, /etc/live/boot.d/*.conf), o en el medio en vivo
-(live/boot.conf, live/boot.d/*.conf).
+raíz (/etc/live/boot.conf, /etc/live/boot/*), o en el medio en vivo
+(live/boot.conf, live/boot/*).
.SH OPCIONES
.\" FIXME
@@ -279,9 +279,9 @@ alfanumérico.
.SH FICHEROS
.IP \fB/etc/live/boot.conf\fP 4
-.IP \fB/etc/live/boot.d/*.conf\fP 4
+.IP \fB/etc/live/boot/*\fP 4
.IP \fBlive/boot.conf\fP 4
-.IP \fBlive/boot.d/*.conf\fP 4
+.IP \fBlive/boot.d/*\fP 4
.IP \fBlive\-persistence.conf\fP 4
.SH "VER ADEMÁS"
diff --git a/manpages/es/live-persistence.conf.es.5 b/manpages/es/live-persistence.conf.es.5
index 6efed50..1737747 100644
--- a/manpages/es/live-persistence.conf.es.5
+++ b/manpages/es/live-persistence.conf.es.5
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 30.07.2012 3.0~a38\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 14.08.2012 3.0~a38\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 64d372e..e3b68a1 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a38-1\n"
-"POT-Creation-Date: 2012-07-30 15:21+0300\n"
+"POT-Creation-Date: 2012-08-14 20:47+0300\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,8 +24,8 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-30"
-msgstr "30.07.2012"
+msgid "2012-08-14"
+msgstr "14.08.2012"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
@@ -132,8 +132,8 @@ msgstr ""
msgid ""
"B<live-boot> can be configured (but not activated) through configuration "
"files. Those files can be placed either in the root filesystem itself (/etc/"
-"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot."
-"conf, live/boot.d/*.conf)."
+"live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, "
+"live/boot/*)."
msgstr ""
#. type: SH
@@ -821,7 +821,7 @@ msgstr ""
#. type: IP
#: en/live-boot.7:151
#, no-wrap
-msgid "B</etc/live/boot.d/*.conf>"
+msgid "B</etc/live/boot/*>"
msgstr ""
#. type: IP
@@ -833,7 +833,7 @@ msgstr ""
#. type: IP
#: en/live-boot.7:153
#, no-wrap
-msgid "B<live/boot.d/*.conf>"
+msgid "B<live/boot/*>"
msgstr ""
#. type: IP
diff --git a/manpages/po/de/live-persistence.conf.5.po b/manpages/po/de/live-persistence.conf.5.po
index 89be656..f8402f4 100644
--- a/manpages/po/de/live-persistence.conf.5.po
+++ b/manpages/po/de/live-persistence.conf.5.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a38-1\n"
-"POT-Creation-Date: 2012-07-30 15:21+0300\n"
+"POT-Creation-Date: 2012-08-14 20:47+0300\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,8 +24,8 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-30"
-msgstr "30.07.2012"
+msgid "2012-08-14"
+msgstr "14.08.2012"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index 1642213..40a2785 100644
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a38-1\n"
-"POT-Creation-Date: 2012-07-30 15:21+0300\n"
+"POT-Creation-Date: 2012-08-14 20:47+0300\n"
"PO-Revision-Date: 2012-06-07 20:29+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
@@ -24,8 +24,8 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-30"
-msgstr "30.07.2012"
+msgid "2012-08-14"
+msgstr "14.08.2012"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
@@ -152,13 +152,13 @@ msgstr "Ficheros de configuración"
msgid ""
"B<live-boot> can be configured (but not activated) through configuration "
"files. Those files can be placed either in the root filesystem itself (/etc/"
-"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot."
-"conf, live/boot.d/*.conf)."
+"live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, "
+"live/boot/*)."
msgstr ""
"B<live-boot> se puede configurar (pero no activar) mediante ficheros de "
"configuración. Estos ficheros se pueden colocar en el sistema de ficheros "
-"raíz (/etc/live/boot.conf, /etc/live/boot.d/*.conf), o en el medio en vivo "
-"(live/boot.conf, live/boot.d/*.conf)."
+"raíz (/etc/live/boot.conf, /etc/live/boot/*), o en el medio en vivo (live/"
+"boot.conf, live/boot/*)."
#. type: SH
#: en/live-boot.7:28 en/live-persistence.conf.5:57
@@ -1009,8 +1009,8 @@ msgstr "B</etc/live/boot.conf>"
#. type: IP
#: en/live-boot.7:151
#, no-wrap
-msgid "B</etc/live/boot.d/*.conf>"
-msgstr "B</etc/live/boot.d/*.conf>"
+msgid "B</etc/live/boot/*>"
+msgstr "B</etc/live/boot/*>"
#. type: IP
#: en/live-boot.7:152
@@ -1021,8 +1021,8 @@ msgstr "B<live/boot.conf>"
#. type: IP
#: en/live-boot.7:153
#, no-wrap
-msgid "B<live/boot.d/*.conf>"
-msgstr "B<live/boot.d/*.conf>"
+msgid "B<live/boot/*>"
+msgstr "B<live/boot.d/*>"
#. type: IP
#: en/live-boot.7:154
diff --git a/manpages/po/es/live-persistence.conf.5.po b/manpages/po/es/live-persistence.conf.5.po
index 44fbf58..7d1a6ab 100644
--- a/manpages/po/es/live-persistence.conf.5.po
+++ b/manpages/po/es/live-persistence.conf.5.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a38-1\n"
-"POT-Creation-Date: 2012-07-30 15:21+0300\n"
+"POT-Creation-Date: 2012-08-14 20:47+0300\n"
"PO-Revision-Date: 2012-06-07 19:11+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
@@ -23,8 +23,8 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-30"
-msgstr "30.07.2012"
+msgid "2012-08-14"
+msgstr "14.08.2012"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index c201c15..67127a0 100644
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-07-30 15:21+0300\n"
+"POT-Creation-Date: 2012-08-14 20:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-30"
+msgid "2012-08-14"
msgstr ""
#. type: TH
@@ -133,8 +133,8 @@ msgstr ""
msgid ""
"B<live-boot> can be configured (but not activated) through configuration "
"files. Those files can be placed either in the root filesystem itself (/etc/"
-"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot."
-"conf, live/boot.d/*.conf)."
+"live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, "
+"live/boot/*)."
msgstr ""
#. type: SH
@@ -822,7 +822,7 @@ msgstr ""
#. type: IP
#: en/live-boot.7:151
#, no-wrap
-msgid "B</etc/live/boot.d/*.conf>"
+msgid "B</etc/live/boot/*>"
msgstr ""
#. type: IP
@@ -834,7 +834,7 @@ msgstr ""
#. type: IP
#: en/live-boot.7:153
#, no-wrap
-msgid "B<live/boot.d/*.conf>"
+msgid "B<live/boot/*>"
msgstr ""
#. type: IP
diff --git a/manpages/pot/live-persistence.conf.5.pot b/manpages/pot/live-persistence.conf.5.pot
index 9fbada0..10e0a3a 100644
--- a/manpages/pot/live-persistence.conf.5.pot
+++ b/manpages/pot/live-persistence.conf.5.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-07-30 15:21+0300\n"
+"POT-Creation-Date: 2012-08-14 20:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-30"
+msgid "2012-08-14"
msgstr ""
#. type: TH
--
live-boot
More information about the debian-live-changes
mailing list