[SCM] live-config branch, debian-next, updated. debian/2.0_a1-1-1-g3914f9a
Daniel Baumann
daniel at debian.org
Mon May 24 09:43:05 UTC 2010
The following commit has been merged in the debian-next branch:
commit 3914f9aaff7745ed4a589a99baa593c8e0ebe221
Author: Daniel Baumann <daniel at debian.org>
Date: Mon May 24 11:36:49 2010 +0200
Additionally supporting configuration directories for configuration files to ease customization.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index f8ef097..178d317 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -38,8 +38,8 @@ Ordnungsnummer.
.SS Konfigurationsdateien
\fBlive\-config\fP kann durch Konfigurationsdateien konfiguriert (nicht aber
aktiviert) werden. Die Konfigurationsdatei kann entweder im Root Dateisystem
-selbst plaziert werden (/etc/live/config.conf) oder auf dem Live Medium
-(live/config.conf).
+selbst plaziert werden (/etc/live/config.conf, /etc/live/config.conf.d/)
+oder auf dem Live Medium (live/config.conf, live/config.conf.d/).
.SH SKRIPTE
\fBlive\-config\fP enthaelt derzeit folgende Skripte in /lib/live/config.
@@ -95,7 +95,9 @@ einem HTTP/FTP Server auszufuehren.
.SH DATEIEN
.IP \fB/etc/live/config.conf\fP 4
+.IP \fB/etc/live/config.conf.d/\fP 4
.IP \fBlive/config.conf\fP 4
+.IP \fBlive/config.conf.d/\fP 4
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index ce04438..553463a 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -19,7 +19,7 @@ If no script should be execured, 'live\-config=none' can be used.
If some scripts are specified, then only those scripts are executed. Note that the order matters, e.g. 'live\-config=sudo,user-setup' would not work since the user needs to be added before it can be configured for sudo. Look at the filenames of the scripts in /lib/live/config for their ordering number.
.SS Configuration Files
-\fBlive\-config\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/config.conf), or on the live media (live/config.conf).
+\fBlive\-config\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config.conf.d/), or on the live media (live/config.conf, live/config.conf.d/).
.SH SCRIPTS
\fBlive\-config\fR currently features the following scripts in /lib/live/config.
@@ -72,7 +72,9 @@ allows to run arbitrary commands from a script placed on the live media or an ht
.SH FILES
.IP "\fB/etc/live/config.conf\fR" 4
+.IP "\fB/etc/live/config.conf.d/\fR" 4
.IP "\fBlive/config.conf\fR" 4
+.IP "\fBlive/config.conf.d/\fR" 4
.IP "\fB/lib/live/config.sh\fR" 4
.IP "\fB/lib/live/config/\fR" 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 8e0d9ce..2ba7c47 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 2.0~a1\n"
-"POT-Creation-Date: 2010-05-24 10:18+0300\n"
+"POT-Creation-Date: 2010-05-24 11:34+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -139,12 +139,13 @@ msgstr "Konfigurationsdateien"
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Those files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf), or on the live media (live/config.conf)."
+"live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
+"config.conf, live/config.conf.d/)."
msgstr ""
"B<live-config> kann durch Konfigurationsdateien konfiguriert (nicht aber "
"aktiviert) werden. Die Konfigurationsdatei kann entweder im Root Dateisystem "
-"selbst plaziert werden (/etc/live/config.conf) oder auf dem Live Medium "
-"(live/config.conf)."
+"selbst plaziert werden (/etc/live/config.conf, /etc/live/config.conf.d/) "
+"oder auf dem Live Medium (live/config.conf, live/config.conf.d/)."
#. type: SH
#: en/live-config.7:24
@@ -435,45 +436,57 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:75
#, no-wrap
+msgid "B</etc/live/config.conf.d/>"
+msgstr "B</etc/live/config.conf.d/>"
+
+#. type: IP
+#: en/live-config.7:76
+#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:76
+#: en/live-config.7:77
+#, no-wrap
+msgid "B<live/config.conf.d/>"
+msgstr "B<live/config.conf.d/>"
+
+#. type: IP
+#: en/live-config.7:78
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:79
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: SH
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:85
msgid "I<live-initramfs>(7)"
msgstr "I<live-initramfs>(7)"
#. type: SH
-#: en/live-config.7:84
+#: en/live-config.7:86
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:86
+#: en/live-config.7:88
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -484,13 +497,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:87
+#: en/live-config.7:89
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:91
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -504,13 +517,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:90
+#: en/live-config.7:92
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 5442815..c9dfc27 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2010-05-24 10:18+0300\n"
+"POT-Creation-Date: 2010-05-24 11:34+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"
@@ -123,7 +123,8 @@ msgstr ""
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Those files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf), or on the live media (live/config.conf)."
+"live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
+"config.conf, live/config.conf.d/)."
msgstr ""
#. type: SH
@@ -409,45 +410,57 @@ msgstr ""
#. type: IP
#: en/live-config.7:75
#, no-wrap
-msgid "B<live/config.conf>"
+msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
#: en/live-config.7:76
#, no-wrap
-msgid "B</lib/live/config.sh>"
+msgid "B<live/config.conf>"
msgstr ""
#. type: IP
#: en/live-config.7:77
#, no-wrap
+msgid "B<live/config.conf.d/>"
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:78
+#, no-wrap
+msgid "B</lib/live/config.sh>"
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:79
+#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
msgid "I<live-helper>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:85
msgid "I<live-initramfs>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:84
+#: en/live-config.7:86
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:86
+#: en/live-config.7:88
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -455,13 +468,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:87
+#: en/live-config.7:89
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:91
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -470,13 +483,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:90
+#: en/live-config.7:92
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/scripts/config.sh b/scripts/config.sh
index d80a32d..833156b 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -96,12 +96,28 @@ Main ()
. /etc/live/config.conf
fi
+ if ls /etc/live/config.conf.d/* > /dev/null 2>&1
+ then
+ for FILE in /etc/live/config.conf.d/*
+ do
+ . ${FILE}
+ done
+ fi
+
# Reading configuration file from live-media (FIXME: needs better name)
if [ -e /live/image/live/config.conf ]
then
. /live/image/live/config.conf
fi
+ if ls /live/image/live/config.conf.d/* > /dev/null 2>&1
+ then
+ for FILE in /live/image/live/config.conf.d/*
+ do
+ . ${FILE}
+ done
+ fi
+
# Reading kernel command line
Cmdline
--
live-config
More information about the debian-live-changes
mailing list