[SCM] live-boot branch, upstream, updated. upstream/2.0.2-1-g2a07836
Daniel Baumann
daniel at debian.org
Thu Sep 2 20:49:50 UTC 2010
The following commit has been merged in the upstream branch:
commit 2a07836d791849359daaace623e8617bd601ffda
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 2 22:44:54 2010 +0200
Adding upstream version 2.0.3.
diff --git a/VERSION b/VERSION
index e9307ca..50ffc5a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.2
+2.0.3
diff --git a/hooks/live b/hooks/live
index e77c88b..3174d17 100755
--- a/hooks/live
+++ b/hooks/live
@@ -30,9 +30,9 @@ then
. /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
- for _FILE in /etc/live/boot.conf.d/*
+ for _FILE in /etc/live/boot.d/*
do
. ${_FILE}
done
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 180da36..398d8ea 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 02.09.2010 2.0.2 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 02.09.2010 2.0.3 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
@@ -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
-(/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
@@ -236,9 +236,9 @@ directory with a tmpfs on the original path.
.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.d/\fP 4
+.IP \fBlive/boot.d/\fP 4
.SH "SIEHE AUCH"
\fIlive\-snapshot\fP(1)
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index a529e18..acee709 100644
--- 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.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 1 02.09.2010 2.0.2 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 02.09.2010 2.0.3 "Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 4d27a19..e22bf10 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-09\-02 2.0.2 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-09\-02 2.0.3 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
@@ -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
-\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.
@@ -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
-.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.d/\fR" 4
+.IP "\fBlive/boot.d/\fR" 4
.SH SEE ALSO
\fIlive\-snapshot\fR(1)
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 70b6a70..4f6e44c 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-09\-02 2.0.2 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-09\-02 2.0.3 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 246b83f..701d25b 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 2.0.2\n"
-"POT-Creation-Date: 2010-09-02 18:25+0300\n"
+"Project-Id-Version: live-boot 2.0.3\n"
+"POT-Creation-Date: 2010-09-02 22:43+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "02.09.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.2"
-msgstr "2.0.2"
+msgid "2.0.3"
+msgstr "2.0.3"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -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/"
-"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
@@ -743,8 +743,8 @@ msgstr "B</etc/live/boot.conf>"
#. 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
@@ -755,8 +755,8 @@ msgstr "B<live/boot.conf>"
#. 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
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index aaedd01..3e715f9 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 2.0.2\n"
-"POT-Creation-Date: 2010-09-02 18:25+0300\n"
+"Project-Id-Version: live-boot 2.0.3\n"
+"POT-Creation-Date: 2010-09-02 22:43+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "02.09.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.2"
-msgstr "2.0.2"
+msgid "2.0.3"
+msgstr "2.0.3"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 803bacd..b291697 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: 2010-09-02 18:25+0300\n"
+"POT-Creation-Date: 2010-09-02 22:43+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"
@@ -31,7 +31,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.2"
+msgid "2.0.3"
msgstr ""
#. type: TH
@@ -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/"
-"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
@@ -738,7 +738,7 @@ msgstr ""
#. 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
@@ -750,7 +750,7 @@ msgstr ""
#. type: IP
#: en/live-boot.7:141
#, no-wrap
-msgid "B<live/boot.conf.d/>"
+msgid "B<live/boot.d/>"
msgstr ""
#. type: SH
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index dfe6d4d..796fef4 100644
--- 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"
-"POT-Creation-Date: 2010-09-02 18:25+0300\n"
+"POT-Creation-Date: 2010-09-02 22:43+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"
@@ -31,7 +31,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.2"
+msgid "2.0.3"
msgstr ""
#. type: TH
--
live-boot
More information about the debian-live-changes
mailing list