[SCM] live-config branch, upstream, updated. upstream/2.0.7-1-g4cf8015
Daniel Baumann
daniel at debian.org
Sat Oct 2 08:13:01 UTC 2010
The following commit has been merged in the upstream branch:
commit 4cf801551dd190a9ab8be680aaa053f5bd68b60c
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Oct 2 10:13:09 2010 +0200
Adding upstream version 2.0.8.
diff --git a/VERSION b/VERSION
index f1547e6..815e68d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.7
+2.0.8
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index ad42b5e..d09155a 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 26.09.2010 2.0.7 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 02.10.2010 2.0.8 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index a9614d0..798cd8b 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2010\-09\-26 2.0.7 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-10\-02 2.0.8 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 866ec1a..f50bb73 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 26.09.2010 2.0.7 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 02.10.2010 2.0.8 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 3125c7f..5aded01 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-09-26"
-msgstr "26.09.2010"
+msgid "2010-10-02"
+msgstr "02.10.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.7"
-msgstr "2.0.7"
+msgid "2.0.8"
+msgstr "2.0.8"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index cc8dd52..245741f 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-09-26"
-msgstr "26.09.2010"
+msgid "2010-10-02"
+msgstr "02.10.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.7"
-msgstr "2.0.7"
+msgid "2.0.8"
+msgstr "2.0.8"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index e68ed7c..00c3d54 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-09-26"
-msgstr "26-09-2010"
+msgid "2010-10-02"
+msgstr "02-10-2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.7"
-msgstr "2.0.7"
+msgid "2.0.8"
+msgstr "2.0.8"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 618027d..78be142 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-09-26 09:00+0300\n"
+"POT-Creation-Date: 2010-10-02 10:11+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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-09-26"
+msgid "2010-10-02"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.7"
+msgid "2.0.8"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 0bdcac4..2ab1d49 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 26\-09\-2010 2.0.7 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 02\-10\-2010 2.0.8 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config.sh b/scripts/config.sh
index eac0cab..ef91947 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -37,7 +37,7 @@ Cmdline ()
_SCRIPTS="$(ls /lib/live/config/*)"
;;
- live-config=*)
+ live-config=*|config=*)
# Only run requested scripts
LIVE_CONFIGS="${_PARAMETER#*config=}"
;;
@@ -237,7 +237,7 @@ Main ()
if ls /live/image/live/config.d/* > /dev/null 2>&1
then
- for FILE in /live/image/live/config.d/*
+ for _FILE in /live/image/live/config.d/*
do
. ${_FILE}
done
diff --git a/scripts/config/999-hooks b/scripts/config/999-hooks
index 074be13..2aa62e9 100755
--- a/scripts/config/999-hooks
+++ b/scripts/config/999-hooks
@@ -24,18 +24,18 @@ Process_hooks ()
{
for _HOOK in $(echo ${LIVE_HOOKS} | sed -e 's/|/ /g')
do
- case "${LIVE_HOOKS}" in
+ case "${_HOOK}" in
filesystem)
if ls /lib/live/hooks/* 2>&1
then
- _HOOKS="${_HOOKS} $(ls /lib/live/hooks/*)"
+ _HOOKS="${_HOOKS} $(for _FILE in /lib/live/hooks/*; do echo file://${_FILE}; done)"
fi
;;
- media)
+ medium)
if ls /live/image/live/hooks/* 2>&1
then
- _HOOKS="${_HOOKS} $(ls /live/image/live/hooks/*)"
+ _HOOKS="${_HOOKS} $(for _FILE in /live/image/live/hooks/*; do echo file://${_FILE}; done)"
fi
;;
@@ -49,10 +49,10 @@ Process_hooks ()
do
_TMPFILE="$(mktemp -t live-config.XXXXXXXX)"
- if $(echo "${_HOOK}" | grep file:\/\/)
+ if echo "${_HOOK}" | grep -qs file://
then
# local file
- cp $(echo ${_HOOK} | sed 's|file\://||') "${_TMPFILE}"
+ cp $(echo ${_HOOK} | sed 's|file://||') "${_TMPFILE}"
else
# remote file
Start_network
--
live-config
More information about the debian-live-changes
mailing list