[SCM] live-config branch, debian-next, updated. debian/3.0_a36-1-2-g33d46d0
Daniel Baumann
daniel at debian.org
Fri Apr 6 08:42:47 UTC 2012
The following commit has been merged in the debian-next branch:
commit 33d46d03120ec7a76f918a7b0350cd397e76b318
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 6 10:42:06 2012 +0200
Using /var/log/live/config.log instead of /var/log/live-config.log for consistency with the other live packages.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 69c7464..23f312f 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -345,7 +345,7 @@ einem HTTP/FTP Server auszuführen.
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
-.IP \fB/var/log/live\-config.log\fP 4
+.IP \fB/var/log/live/config.log\fP 4
.SH "SIEHE AUCH"
\fIlive\-boot\fP(7)
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index a8941e6..6f0d49e 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -236,7 +236,7 @@ allows to run arbitrary commands from a script placed on the live media or an ht
.IP "\fB/lib/live/config.sh\fR" 4
.IP "\fB/lib/live/config/\fR" 4
.IP "\fB/var/lib/live/config/\fR" 4
-.IP "\fB/var/log/live-config.log\fR" 4
+.IP "\fB/var/log/live/config.log\fR" 4
.SH SEE ALSO
\fIlive\-boot\fR(7)
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 1a717af..3e8cb6d 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -336,7 +336,7 @@ el medio en vivo o en un servidor http/ftp.
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
-.IP \fB/var/log/live\-config.log\fP 4
+.IP \fB/var/log/live/config.log\fP 4
.SH "VER ADEMÁS"
\fIlive\-boot\fP(7)
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 6e07df6..425ae62 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -347,7 +347,7 @@ média live, ou sur un serveur http/ftp.
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
-.IP \fB/var/log/live\-config.log\fP 4
+.IP \fB/var/log/live/config.log\fP 4
.SH "VOIR AUSSI"
\fIlive\-boot\fP(7)
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index be64d4d..2d88d84 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -334,7 +334,7 @@ live o su un server http/ftp.
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
-.IP \fB/var/log/live\-config.log\fP 4
+.IP \fB/var/log/live/config.log\fP 4
.SH "VEDERE ANCHE"
\fIlive\-boot\fP(7)
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 552f98b..0e1d833 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 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:30+0300\n"
+"POT-Creation-Date: 2012-04-06 10:40+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"
@@ -1420,8 +1420,8 @@ msgstr "B</var/lib/live/config/>"
#. type: IP
#: en/live-config.7:239
#, no-wrap
-msgid "B</var/log/live-config.log>"
-msgstr "B</var/log/live-config.log>"
+msgid "B</var/log/live/config.log>"
+msgstr "B</var/log/live/config.log>"
#. type: SH
#: en/live-config.7:241
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index c1802e5..f522103 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:30+0300\n"
+"POT-Creation-Date: 2012-04-06 10:40+0300\n"
"PO-Revision-Date: 2011-12-06 17:47+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -1412,8 +1412,8 @@ msgstr "B</var/lib/live/config/>"
#. type: IP
#: en/live-config.7:239
#, no-wrap
-msgid "B</var/log/live-config.log>"
-msgstr "B</var/log/live-config.log>"
+msgid "B</var/log/live/config.log>"
+msgstr "B</var/log/live/config.log>"
#. type: SH
#: en/live-config.7:241
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 1155bf3..60f2b22 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:30+0300\n"
+"POT-Creation-Date: 2012-04-06 10:40+0300\n"
"PO-Revision-Date: 2011-12-06 18:02+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -1426,8 +1426,8 @@ msgstr "B</var/lib/live/config/>"
#. type: IP
#: en/live-config.7:239
#, no-wrap
-msgid "B</var/log/live-config.log>"
-msgstr "B</var/log/live-config.log>"
+msgid "B</var/log/live/config.log>"
+msgstr "B</var/log/live/config.log>"
#. type: SH
#: en/live-config.7:241
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index b7003ed..65dc9be 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:30+0300\n"
+"POT-Creation-Date: 2012-04-06 10:40+0300\n"
"PO-Revision-Date: 2011-12-06 08:01+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: none\n"
@@ -1413,8 +1413,8 @@ msgstr "B</var/lib/live/config/>"
#. type: IP
#: en/live-config.7:239
#, no-wrap
-msgid "B</var/log/live-config.log>"
-msgstr "B</var/log/live-config.log>"
+msgid "B</var/log/live/config.log>"
+msgstr "B</var/log/live/config.log>"
#. type: SH
#: en/live-config.7:241
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index b7c9c01..004b9d4 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:30+0300\n"
+"POT-Creation-Date: 2012-04-06 10:40+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
"Language-Team: none\n"
@@ -1404,8 +1404,8 @@ msgstr "B</var/lib/live/config/>"
#. type: IP
#: en/live-config.7:239
#, no-wrap
-msgid "B</var/log/live-config.log>"
-msgstr "B</var/log/live-config.log>"
+msgid "B</var/log/live/config.log>"
+msgstr "B</var/log/live/config.log>"
#. type: SH
#: en/live-config.7:241
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index a4d0922..02fc46a 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: 2012-04-06 10:30+0300\n"
+"POT-Creation-Date: 2012-04-06 10:40+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"
@@ -1263,7 +1263,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:239
#, no-wrap
-msgid "B</var/log/live-config.log>"
+msgid "B</var/log/live/config.log>"
msgstr ""
#. type: SH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 7b1d6e2..704e75e 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -336,7 +336,7 @@ mídia live ou um servidor http/ftp.
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
-.IP \fB/var/log/live\-config.log\fP 4
+.IP \fB/var/log/live/config.log\fP 4
.SH "VER TAMBÉM"
\fIlive\-boot\fP(7)
diff --git a/scripts/config.sh b/scripts/config.sh
index c8c93dc..3819752 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -204,12 +204,14 @@ Main ()
;;
esac
- _SCRIPTS="$(echo ${_SCRIPTS} | sed -e 's| |\n|g' | sort -u)"
+ mkdir -p /var/log/live
# Configuring system
+ _SCRIPTS="$(echo ${_SCRIPTS} | sed -e 's| |\n|g' | sort -u)"
+
for _SCRIPT in ${_SCRIPTS}
do
- . ${_SCRIPT} 2>&1 | tee -a /var/log/live-config.log
+ . ${_SCRIPT} 2>&1 | tee -a /var/log/live/config.log
done
echo "."
--
live-config
More information about the debian-live-changes
mailing list