Only looking at boot.d files if they have the .conf suffix to allow putting other...

diff --git a/hooks/live b/hooks/live
index b023d4b..40802d0 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -32,9 +32,9 @@ then
        . /etc/live/boot.conf
 fi
 
        . /etc/live/boot.conf
 fi
 

-if ls /etc/live/boot.d/* > /dev/null 2>&1
+if ls /etc/live/boot.d/*.conf > /dev/null 2>&1

 then
 then

-       for _FILE in /etc/live/boot.d/*
+       for _FILE in /etc/live/boot.d/*.conf

        do
                . ${_FILE}
        done
        do
                . ${_FILE}
        done

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 632f85d..806ded8 100644 (file)
--- 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.
 .\"
 .\"*******************************************************************
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************

-.TH LIVE\-BOOT 7 2012\-04\-05 3.0~a26\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-04\-06 3.0~a26\-1 "Debian Live Project"

 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
 
 .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
 .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/), or on the live media
-(live/boot.conf, live/boot.d/).
+(/etc/live/boot.conf, /etc/live/boot.d/*.conf), or on the live media
+(live/boot.conf, live/boot.d/*.conf).

 
 .SH OPTIONS
 .\" FIXME
 
 .SH OPTIONS
 .\" FIXME


@@ -280,9 +280,9 @@ directory with a tmpfs on the original path.
 
 .SH FILES
 .IP \fB/etc/live/boot.conf\fP 4
 
 .SH FILES
 .IP \fB/etc/live/boot.conf\fP 4

-.IP \fB/etc/live/boot.d/\fP 4
+.IP \fB/etc/live/boot.d/*.conf\fP 4

 .IP \fBlive/boot.conf\fP 4
 .IP \fBlive/boot.conf\fP 4

-.IP \fBlive/boot.d/\fP 4
+.IP \fBlive/boot.d/*.conf\fP 4

 .IP \fBlive.persist\fP 4
 
 .SH "SEE ALSO"
 .IP \fBlive.persist\fP 4
 
 .SH "SEE ALSO"

diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 9b26898..d63061d 100644 (file)
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************

-.TH LIVE\-BOOT 1 2012\-04\-05 3.0~a26\-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-04\-06 3.0~a26\-1 "Debian Live Project"

 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage
 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage

diff --git a/manpages/de/live.persist.5.de.persist b/manpages/de/live.persist.5.de.persist
index 672bb7d..3db7e24 100644 (file)
--- a/manpages/de/live.persist.5.de.persist
+++ b/manpages/de/live.persist.5.de.persist
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************

-.TH LIVE\-BOOT persist 2012\-04\-05 3.0~a26\-1 "Debian Live Project"
+.TH LIVE\-BOOT persist 2012\-04\-06 3.0~a26\-1 "Debian Live Project"

 
 .SH NAME
 \fBlive.persist\fP \- Configuration file for persistent media in live\-boot
 
 .SH NAME
 \fBlive.persist\fP \- Configuration file for persistent media in live\-boot

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 946eeb7..36bb82b 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-04\-05 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-04\-06 3.0~a26-1 "Debian Live Project"

 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
 
 .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
 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/), or on the live media (live/boot.conf, live/boot.d/).
+\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).

 
 .SH OPTIONS
 \fBlive\-boot\fR currently features the following parameters.
 
 .SH OPTIONS
 \fBlive\-boot\fR currently features the following parameters.


@@ -154,9 +154,9 @@ This saves expensive writes and speeds up operations on volatile data such as we
 
 .SH FILES
 .IP "\fB/etc/live/boot.conf\fR" 4
 
 .SH FILES
 .IP "\fB/etc/live/boot.conf\fR" 4

-.IP "\fB/etc/live/boot.d/\fR" 4
+.IP "\fB/etc/live/boot.d/*.conf\fR" 4

 .IP "\fBlive/boot.conf\fR" 4
 .IP "\fBlive/boot.conf\fR" 4

-.IP "\fBlive/boot.d/\fR" 4
+.IP "\fBlive/boot.d/*.conf\fR" 4

 .IP "\fBlive.persist\fR" 4
 
 .SH SEE ALSO
 .IP "\fBlive.persist\fR" 4
 
 .SH SEE ALSO

diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 0e88a32..23e7bde 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2012\-04\-05 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-04\-06 3.0~a26-1 "Debian Live Project"

 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage
 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage

diff --git a/manpages/en/live.persist.5 b/manpages/en/live.persist.5
index 615eb7a..45c19df 100644 (file)
--- a/manpages/en/live.persist.5
+++ b/manpages/en/live.persist.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT persist 2012\-04\-05 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT persist 2012\-04\-06 3.0~a26-1 "Debian Live Project"

 
 .SH NAME
 \fBlive.persist\fR \- Configuration file for persistent media in
 
 .SH NAME
 \fBlive.persist\fR \- Configuration file for persistent media in

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 1583e8d..2c8d9ad 100644 (file)
--- 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~a26\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a26\n"

-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-06 10:35+0300\n"

 "PO-Revision-Date: 2012-04-05 08:11+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "PO-Revision-Date: 2012-04-05 08:11+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


@@ -24,7 +24,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap

-msgid "2012-04-05"
+msgid "2012-04-06"

 msgstr ""
 
 #. type: TH
 msgstr ""
 
 #. type: TH


@@ -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/"
 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/), or on the live media (live/boot.conf, "
-"live/boot.d/)."
+"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot."
+"conf, live/boot.d/*.conf)."

 msgstr ""
 
 #. type: SH
 msgstr ""
 
 #. type: SH


@@ -866,7 +866,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:157
 #, no-wrap
 #. type: IP
 #: en/live-boot.7:157
 #, no-wrap

-msgid "B</etc/live/boot.d/>"
+msgid "B</etc/live/boot.d/*.conf>"

 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP


@@ -878,7 +878,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:159
 #, no-wrap
 #. type: IP
 #: en/live-boot.7:159
 #, no-wrap

-msgid "B<live/boot.d/>"
+msgid "B<live/boot.d/*.conf>"

 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 3907d36..9a34a28 100644 (file)
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a26-1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a26-1\n"

-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-06 10:35+0300\n"

 "PO-Revision-Date: 2012-04-05 08:11+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "PO-Revision-Date: 2012-04-05 08:11+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


@@ -24,7 +24,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap

-msgid "2012-04-05"
+msgid "2012-04-06"

 msgstr ""
 
 #. type: TH
 msgstr ""
 
 #. type: TH

diff --git a/manpages/po/de/live.persist.5.po b/manpages/po/de/live.persist.5.po
index d9981d5..ee49618 100644 (file)
--- a/manpages/po/de/live.persist.5.po
+++ b/manpages/po/de/live.persist.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a26-1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a26-1\n"

-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-06 10:35+0300\n"

 "PO-Revision-Date: 2012-04-05 08:11+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "PO-Revision-Date: 2012-04-05 08:11+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


@@ -24,7 +24,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap

-msgid "2012-04-05"
+msgid "2012-04-06"

 msgstr ""
 
 #. type: TH
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index a0d0478..48f8159 100644 (file)
--- 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"
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"

-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-06 10:35+0300\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -25,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap

-msgid "2012-04-05"
+msgid "2012-04-06"

 msgstr ""
 
 #. type: TH
 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/"
 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/), or on the live media (live/boot.conf, "
-"live/boot.d/)."
+"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot."
+"conf, live/boot.d/*.conf)."

 msgstr ""
 
 #. type: SH
 msgstr ""
 
 #. type: SH


@@ -867,7 +867,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:157
 #, no-wrap
 #. type: IP
 #: en/live-boot.7:157
 #, no-wrap

-msgid "B</etc/live/boot.d/>"
+msgid "B</etc/live/boot.d/*.conf>"

 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP


@@ -879,7 +879,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:159
 #, no-wrap
 #. type: IP
 #: en/live-boot.7:159
 #, no-wrap

-msgid "B<live/boot.d/>"
+msgid "B<live/boot.d/*.conf>"

 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index a20119c..5eecfda 100644 (file)
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"

-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-06 10:35+0300\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -25,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap

-msgid "2012-04-05"
+msgid "2012-04-06"

 msgstr ""
 
 #. type: TH
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/live.persist.5.pot b/manpages/pot/live.persist.5.pot
index b0e4919..49659d3 100644 (file)
--- a/manpages/pot/live.persist.5.pot
+++ b/manpages/pot/live.persist.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"

-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-06 10:35+0300\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -25,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
 #, no-wrap

-msgid "2012-04-05"
+msgid "2012-04-06"

 msgstr ""
 
 #. type: TH
 msgstr ""
 
 #. type: TH