Using boot.d instead of boot.conf.d as directory name for custom configuration files.

diff --git a/hooks/live b/hooks/live
index 19ff26a..85a98a3 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -30,9 +30,9 @@ then
        . /etc/live/boot.conf
 fi
 
        . /etc/live/boot.conf
 fi
 

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

 then
 then

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

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

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index aedc998..c5bb276 100644 (file)
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -38,8 +38,8 @@ see below.
 .SS Konfigurationsdateien
 \fBlive\-boot\fP can be configured (but not activated) through configuration
 files. Those files can be placed either in the root filesystem itself
 .SS Konfigurationsdateien
 \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.conf.d/), or on the live media
-(live/boot.conf, live/boot.conf.d/).
+(/etc/live/boot.conf, /etc/live/boot.d/), or on the live media
+(live/boot.conf, live/boot.d/).

 
 .SH OPTIONEN
 .\" FIXME
 
 .SH OPTIONEN
 .\" FIXME


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

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

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

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

 
 .SH "SIEHE AUCH"
 \fIlive\-snapshot\fP(1)
 
 .SH "SIEHE AUCH"
 \fIlive\-snapshot\fP(1)

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 61d07bf..14b101a 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -21,7 +21,7 @@ At boot time it will look for a (read\-only) media containing a "/live" director
 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.conf.d/), or on the live media (live/boot.conf, live/boot.conf.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/), or on the live media (live/boot.conf, live/boot.d/).

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


@@ -136,9 +136,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.conf.d/\fR" 4
+.IP "\fB/etc/live/boot.d/\fR" 4

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

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

 
 .SH SEE ALSO
 \fIlive\-snapshot\fR(1)
 
 .SH SEE ALSO
 \fIlive\-snapshot\fR(1)

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 8e94fea..023b008 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~a3\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a3\n"

-"POT-Creation-Date: 2010-09-02 18:30+0300\n"
+"POT-Creation-Date: 2010-09-02 21:27+0300\n"

 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"


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

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


@@ -743,8 +743,8 @@ msgstr "B</etc/live/boot.conf>"
 #. type: IP
 #: en/live-boot.7:139
 #, no-wrap
 #. type: IP
 #: en/live-boot.7:139
 #, no-wrap

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

 
 #. type: IP
 #: en/live-boot.7:140
 
 #. type: IP
 #: en/live-boot.7:140


@@ -755,8 +755,8 @@ msgstr "B<live/boot.conf>"
 #. type: IP
 #: en/live-boot.7:141
 #, no-wrap
 #. type: IP
 #: en/live-boot.7:141
 #, no-wrap

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

 
 #. type: SH
 #: en/live-boot.7:143 en/live-snapshot.1:52
 
 #. type: SH
 #: en/live-boot.7:143 en/live-snapshot.1:52

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index b3503e7..31925ed 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: 2010-09-02 18:30+0300\n"
+"POT-Creation-Date: 2010-09-02 21:27+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"


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

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


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

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

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


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

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

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