From: Daniel Baumann Date: Wed, 9 Mar 2011 16:11:32 +0000 (+0100) Subject: Adding upstream version 3.0~a4. X-Git-Tag: upstream/3.0_a4^0 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=fb986329e0ee3dedc5873f22a40dfc8a0f7a4207 Adding upstream version 3.0~a4. --- diff --git a/VERSION b/VERSION index 2f4c7df..d436840 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~a3 +3.0~a4 diff --git a/hooks/live b/hooks/live index 19ff26a..85a98a3 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 aedc998..c4ac50a 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 3.0~a3 "Debian Live Projekt" +.TH LIVE\-BOOT 7 02.09.2010 3.0~a4 "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 eada7a1..eb52933 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 3.0~a3 "Debian Live Projekt" +.TH LIVE\-BOOT 1 02.09.2010 3.0~a4 "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 61d07bf..f2cd174 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2010\-09\-02 3.0~a3 "Debian Live Project" +.TH LIVE\-BOOT 7 2010\-09\-02 3.0~a4 "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 daf567f..47dff38 100644 --- a/manpages/en/live-snapshot.1 +++ b/manpages/en/live-snapshot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 1 2010\-09\-02 3.0~a3 "Debian Live Project" +.TH LIVE\-BOOT 1 2010\-09\-02 3.0~a4 "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 8e94fea..44e617d 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 3.0~a3\n" -"POT-Creation-Date: 2010-09-02 18:30+0300\n" +"Project-Id-Version: live-boot 3.0~a4\n" +"POT-Creation-Date: 2010-09-02 22:46+0300\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \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 "3.0~a3" -msgstr "3.0~a3" +msgid "3.0~a4" +msgstr "3.0~a4" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 @@ -131,8 +131,8 @@ msgstr "Konfigurationsdateien" msgid "" "B 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" #. type: IP #: en/live-boot.7:139 #, no-wrap -msgid "B" -msgstr "B" +msgid "B" +msgstr "B" #. type: IP #: en/live-boot.7:140 @@ -755,8 +755,8 @@ msgstr "B" #. type: IP #: en/live-boot.7:141 #, no-wrap -msgid "B" -msgstr "B" +msgid "B" +msgstr "B" #. 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 66233f7..fe1f7ee 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 3.0~a3\n" -"POT-Creation-Date: 2010-09-02 18:30+0300\n" +"Project-Id-Version: live-boot 3.0~a4\n" +"POT-Creation-Date: 2010-09-02 22:46+0300\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \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 "3.0~a3" -msgstr "3.0~a3" +msgid "3.0~a4" +msgstr "3.0~a4" #. 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 b3503e7..47200a8 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:30+0300\n" +"POT-Creation-Date: 2010-09-02 22:46+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a3" +msgid "3.0~a4" msgstr "" #. type: TH @@ -126,8 +126,8 @@ msgstr "" msgid "" "B 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" +msgid "B" msgstr "" #. type: IP @@ -750,7 +750,7 @@ msgstr "" #. type: IP #: en/live-boot.7:141 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: SH diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot index 4d54a8c..eb3b076 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:30+0300\n" +"POT-Creation-Date: 2010-09-02 22:46+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a3" +msgid "3.0~a4" msgstr "" #. type: TH