[SCM] live-config branch, upstream, updated. upstream/3.0_a26-1-gbff3a08
Daniel Baumann
daniel at debian.org
Fri Sep 23 18:45:20 UTC 2011
The following commit has been merged in the upstream branch:
commit bff3a0846f92cd19f5c457f4524459dd57b4b09c
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Sep 23 20:45:39 2011 +0200
Adding upstream version 3.0~a20.
diff --git a/Makefile b/Makefile
index a70562d..27d0205 100644
--- a/Makefile
+++ b/Makefile
@@ -68,19 +68,19 @@ install:
uninstall:
# Uninstalling scripts
rm -rf $(DESTDIR)/lib/live/config.sh $(DESTDIR)/lib/live/config
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib/live || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib/live > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib/live/config || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib/live || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/var || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib/live/config > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib/live > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/var > /dev/null 2>&1 || true
# Uninstalling docs
rm -rf $(DESTDIR)/usr/share/doc/live-config
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
# Uninstalling manpages
for MANPAGE in manpages/en/*; \
@@ -100,15 +100,15 @@ uninstall:
for SECTION in $(ls manpages/en/* | awk -F. '{ print $2 }'); \
do \
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} || true; \
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/*/man$${SECTION} || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/*/man$${SECTION} > /dev/null 2>&1 || true; \
done
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR) || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true
clean:
@echo "Nothing to clean."
diff --git a/VERSION b/VERSION
index 7577de0..0aa9ed7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a26
+3.0~a27
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index ed95eff..435663c 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 24.08.2011 3.0~a26 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 23.09.2011 3.0~a27 "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 6ad4d54..3124cd6 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 2011\-08\-24 3.0~a26 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2011\-09\-23 3.0~a27 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 2f1ea0d..5322048 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 24.08.2011 3.0~a26 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 23.09.2011 3.0~a27 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-config\fP \- Scripts de configuración del sistema
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 31b45c0..efc45e3 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 24.08.2011 3.0~a26 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 23.09.2011 3.0~a27 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index 41f4083..d84ab30 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 24.08.2011 3.0~a26 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 23.09.2011 3.0~a27 "Progetto Debian Live"
.SH NOME
\fBlive\-config\fP \- Script di configurazione del sistema
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 3f0c122..40a9bbf 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a26\n"
-"POT-Creation-Date: 2011-08-24 19:28+0300\n"
+"Project-Id-Version: live-config 3.0~a27\n"
+"POT-Creation-Date: 2011-09-23 20: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"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-08-24"
-msgstr "24.08.2011"
+msgid "2011-09-23"
+msgstr "23.09.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a26"
-msgstr "3.0~a26"
+msgid "3.0~a27"
+msgstr "3.0~a27"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index 441c944..cf8f382 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -5,8 +5,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a26\n"
-"POT-Creation-Date: 2011-08-24 19:28+0300\n"
+"Project-Id-Version: live-config 3.0~a27\n"
+"POT-Creation-Date: 2011-09-23 20:40+0300\n"
"PO-Revision-Date: 2011-05-07 19:51+0100\n"
"Last-Translator: José Luis Zabalza <jlz.3008 at gmail.com> and Carlos Zuferri "
"\"chals\" <chals at altorricon.com>\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-08-24"
-msgstr "24.08.2011"
+msgid "2011-09-23"
+msgstr "23.09.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a26"
-msgstr "3.0~a26"
+msgid "3.0~a27"
+msgstr "3.0~a27"
#. 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 3a45ea1..f86e132 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a26\n"
-"POT-Creation-Date: 2011-08-24 19:28+0300\n"
+"Project-Id-Version: live-config 3.0~a27\n"
+"POT-Creation-Date: 2011-09-23 20:40+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-08-24"
-msgstr "24.08.2011"
+msgid "2011-09-23"
+msgstr "23.09.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a26"
-msgstr "3.0~a26"
+msgid "3.0~a27"
+msgstr "3.0~a27"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index 006af82..47df077 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a26\n"
-"POT-Creation-Date: 2011-08-24 19:28+0300\n"
+"Project-Id-Version: live-config 3.0~a27\n"
+"POT-Creation-Date: 2011-09-23 20:40+0300\n"
"PO-Revision-Date: 2011-01-20 22:31+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-08-24"
-msgstr "24.08.2011"
+msgid "2011-09-23"
+msgstr "23.09.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a26"
-msgstr "3.0~a26"
+msgid "3.0~a27"
+msgstr "3.0~a27"
#. 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 75efbf1..22e2ef9 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a26\n"
-"POT-Creation-Date: 2011-08-24 19:28+0300\n"
+"Project-Id-Version: live-config 3.0~a27\n"
+"POT-Creation-Date: 2011-09-23 20: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"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-08-24"
-msgstr "08-24-2011"
+msgid "2011-09-23"
+msgstr "09-23-2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a26"
-msgstr "3.0~a26"
+msgid "3.0~a27"
+msgstr "3.0~a27"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 5f683eb..dbe9279 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: 2011-08-24 19:28+0300\n"
+"POT-Creation-Date: 2011-09-23 20: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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-08-24"
+msgid "2011-09-23"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a26"
+msgid "3.0~a27"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 1a06d1d..e62690d 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 08\-24\-2011 3.0~a26 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 09\-23\-2011 3.0~a27 "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 a8c1c00..069ca93 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -91,7 +91,7 @@ Cmdline ()
then
for _CONFIG in $(echo ${LIVE_CONFIGS} | sed -e 's|,| |g')
do
- _SCRIPTS="${_SCRIPTS} $(ls /lib/live/config/???-${_CONFIG})"
+ _SCRIPTS="${_SCRIPTS} $(ls /lib/live/config/???-${_CONFIG} 2> /dev/null || true)"
done
fi
@@ -100,7 +100,7 @@ Cmdline ()
then
for _NOCONFIG in $(echo ${LIVE_NOCONFIGS} | sed -e 's|,| |g')
do
- _SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/config/???-${_NOCONFIG})||")"
+ _SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/config/???-${_NOCONFIG} 2> /dev/null || echo none)||")"
done
fi
}
@@ -133,7 +133,7 @@ Start_network ()
/etc/init.d/networking start > /dev/null 2>&1
# Now force adapter up if specified with ethdevice= on cmdline
- if [ ! -z "${ETHDEVICE}" ]
+ if [ -n "${ETHDEVICE}" ]
then
ifup --force "${ETHDEVICE}"
fi
@@ -186,10 +186,13 @@ Main ()
# Reading kernel command line
Cmdline
- if [ "${LIVE_DEBUG}" = "true" ]
- then
- set -x
- fi
+ case "${LIVE_DEBUG}" in
+ true)
+ set -x
+ ;;
+ esac
+
+ _SCRIPTS="$(echo ${_SCRIPTS} | sed -e 's| |\n|g' | sort -u)"
# Configuring system
for _SCRIPT in ${_SCRIPTS}
--
live-config
More information about the debian-live-changes
mailing list