[SCM] live-config branch, upstream, updated. upstream/3.0_a17-1-g8a11f80

Daniel Baumann daniel at debian.org
Fri Mar 25 11:42:31 UTC 2011 

The following commit has been merged in the upstream branch:
commit 8a11f80a9873d2e082f28352c8e4b674f18089d6
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Mar 25 12:42:05 2011 +0100

    Adding upstream version 3.0~a18.

diff --git a/VERSION b/VERSION
index 31cfe14..2b538e2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a17
+3.0~a18
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 02a19c5..dae8798 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 2011\-03\-11 3.0~a17 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 25.03.2011 3.0~a18 "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 d7a90dd..dd71915 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\-03\-11 3.0~a17 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2011\-03\-25 3.0~a18 "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 1d56f00..10797a1 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 2011\-03\-11 3.0~a17 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 2011\-03\-25 3.0~a18 "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 0ce41f6..cbd3ced 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 2011\-03\-11 3.0~a17 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 25.03.2011 3.0~a18 "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 ba3f4bf..f203ff2 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 2011\-03\-11 3.0~a17 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 25.03.2011 3.0~a18 "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 d9ece7a..8a6cda3 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~a17\n"
-"POT-Creation-Date: 2011-03-11 17:11+0100\n"
+"POT-Creation-Date: 2011-03-25 12:38+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -23,13 +23,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "2011-03-11"
-msgstr "11.03.2011"
+#, no-wrap
+msgid "2011-03-25"
+msgstr "25.03.2011"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "3.0~a17"
-msgstr "3.0~a17"
+#, no-wrap
+msgid "3.0~a18"
+msgstr "3.0~a18"
 
 #. 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 f674e5b..8960497 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a17\n"
-"POT-Creation-Date: 2011-03-11 17:11+0100\n"
+"POT-Creation-Date: 2011-03-25 12:38+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Carlos Zuferri \"chals\" <chals at altorricon.com>\n"
 "Language-Team: none\n"
@@ -22,13 +22,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "2011-03-11"
-msgstr "2011-03-11"
+#, no-wrap
+msgid "2011-03-25"
+msgstr "2011-03-25"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "3.0~a17"
-msgstr "3.0~a17"
+#, no-wrap
+msgid "3.0~a18"
+msgstr "3.0~a18"
 
 #. 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 24dcf53..39cdaa3 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a17\n"
-"POT-Creation-Date: 2011-03-11 17:11+0100\n"
+"POT-Creation-Date: 2011-03-25 12:38+0100\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"
@@ -23,13 +23,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "2011-03-11"
-msgstr "11.03.2011"
+#, no-wrap
+msgid "2011-03-25"
+msgstr "25.03.2011"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "3.0~a17"
-msgstr "3.0~a17"
+#, no-wrap
+msgid "3.0~a18"
+msgstr "3.0~a18"
 
 #. 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 af7ab87..45059f2 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~a17\n"
-"POT-Creation-Date: 2011-03-11 17:11+0100\n"
+"POT-Creation-Date: 2011-03-25 12:38+0100\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"
@@ -22,13 +22,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "2011-03-11"
-msgstr "11.03.2011"
+#, no-wrap
+msgid "2011-03-25"
+msgstr "25.03.2011"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "3.0~a17"
-msgstr "3.0~a17"
+#, no-wrap
+msgid "3.0~a18"
+msgstr "3.0~a18"
 
 #. 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 3f44944..846f67b 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~a17\n"
-"POT-Creation-Date: 2011-03-11 17:11+0100\n"
+"POT-Creation-Date: 2011-03-25 12:38+0100\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"
@@ -22,13 +22,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "2011-03-11"
-msgstr "03-11-2011"
+#, no-wrap
+msgid "2011-03-25"
+msgstr "03-25-2011"
 
 #. type: TH
 #: en/live-config.7:9
-msgid "3.0~a17"
-msgstr "3.0~a17"
+#, no-wrap
+msgid "3.0~a18"
+msgstr "3.0~a18"
 
 #. type: TH
 #: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 56cac9b..b3d42e4 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-03-11 17:11+0100\n"
+"POT-Creation-Date: 2011-03-25 12:38+0100\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-03-11"
+msgid "2011-03-25"
 msgstr ""
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0~a17"
+msgid "3.0~a18"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index bb5df0d..eb25f32 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 2011\-03\-11 3.0~a17 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 03\-25\-2011 3.0~a18 "Projeto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config/014-upstart b/scripts/config/016-upstart
similarity index 66%
rename from scripts/config/014-upstart
rename to scripts/config/016-upstart
index 9aeea88..d09e420 100755
--- a/scripts/config/014-upstart
+++ b/scripts/config/016-upstart
@@ -2,7 +2,6 @@
 
 ## live-config(7) - System Configuration Scripts
 ## Copyright (C) 2006-2011 Daniel Baumann <daniel at debian.org>
-## Copyright (C) 2011 Marco Amadori <marco.amadori at gmail.com>
 ##
 ## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -25,28 +24,29 @@ Upstart ()
 
 Configure_upstart ()
 {
-	for ttyfile in /etc/init/tty*
+	for _FILE in /etc/init/tty*
 	do
-		ttynum=$(basename "${ttyfile}" .conf)
+		_TTY="$(basename ${_FILE} .conf)"
 
 		# mingetty has autologin support
-		if grep -qs '^exec.*mingetty' || [ -e /sbin/mingetty ]
+		if [ -e /sbin/mingetty ] || grep -qs '^exec.*mingetty' "${_FILE}"
 		then
-			sed -i -e 's|^\(exec.*getty\) *\(--autologin *[^ ]* *\)*.*$|exec /sbin/mingetty --autologin '"${LIVE_USERNAME} ${ttynum}|g" "${ttyfile}"
+			sed -i -e 's|^\(exec.*getty\) *\(--autologin *[^ ]* *\)*.*$|exec /sbin/mingetty --autologin '"${LIVE_USERNAME} ${_TTY}|g" "${_FILE}"
 		else
 			# substitute getty with a direct login
-			sed -i -e 's|^exec.*getty.*$|exec /bin/login -f '"${LIVE_USERNAME} </dev/${ttynum} >/dev/${ttynum} 2>\&1|" "${ttyfile}"
+			sed -i -e 's|^exec.*getty.*$|exec /bin/login -f '"${LIVE_USERNAME} </dev/${_TTY} >/dev/${_TTY} 2>\&1|" "${_FILE}"
 		fi
 	done
 
 	init q
 
-	for ttyfile in /etc/init/tty*
+	for _FILE in /etc/init/tty*
 	do
-		ttynum=$(basename "${ttyfile}" .conf)
-		echo "reload ${ttynum}"
-		stop $ttynum
-		start $ttynum
+		_TTY="$(basename ${_FILE} .conf)"
+
+		# reloading
+		stop ${_TTY}
+		start ${_TTY}
 	done
 
 	# Creating state file
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index 683f82a..d7a2445 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -76,13 +76,19 @@ Configure_xserver_xorg ()
 
 	if [ -n "${LIVE_XORG_DRIVER}" ]
 	then
-		echo "xserver-xorg xserver-xorg/autodetect_video_card" >> /tmp/debconf.live
-		echo "xserver-xorg xserver-xorg/config/device/driver ${LIVE_XORG_DRIVER}" >> /tmp/debconf.live
+
+cat > /etc/X11/xorg.conf.d/99-live_driver.conf << EOF
+Section "Device"
+	Identifier	"Default screen"
+	Driver		"${LIVE_XORG_DRIVER}"
+EndSection
+EOF
+
 	fi
 
 	if [ -n "${LIVE_XORG_RESOLUTION}" ]
 	then
-		echo "xrandr -s ${LIVE_XORG_RESOLUTION} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode
+		echo "xrandr -s ${LIVE_XORG_RESOLUTION} || /bin/true" >> /etc/X11/Xsession.d/21xvidemode
 	else
 		rm -f /etc/X11/Xsession.d/21xvidemode
 	fi

-- 
live-config

More information about the debian-live-changes mailing list