[SCM] live-config branch, upstream, updated. upstream/3.0_a32-1-ge8f59a7

Daniel Baumann daniel at debian.org
Sun Mar 18 13:39:57 UTC 2012


The following commit has been merged in the upstream branch:
commit e8f59a756f6b553f463066195d8c2ff815fbd0cb
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Mar 18 14:38:12 2012 +0100

    Adding upstream version 3.0~a33.

diff --git a/Makefile b/Makefile
index 27d0205..9c60d5a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,13 @@
 # Makefile
 
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
 SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
diff --git a/VERSION b/VERSION
index 9b7a959..e847583 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a32
+3.0~a33-1
diff --git a/bin/live-config-update b/bin/live-config-update
index df60c5c..83ac9d0 100755
--- a/bin/live-config-update
+++ b/bin/live-config-update
@@ -1,92 +1,89 @@
 #!/bin/sh
 
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
 set -e
 
 _DIRECTORY="${1:-/lib/live/config}"
 
 if [ ! -e "${_DIRECTORY}" ]
 then
-	echo "E: ${_DIRECTORY} - not found."
+	echo "E: cannot access ${_DIRECTORY}: No such directory."
 	exit 1
 fi
 
 if [ ! -x "$(which lsb_release 2>/dev/null)" ]
 then
-	echo "E: lsb_release - command not found"
+	echo "E: lsb_release: command not found."
 	echo "I: lsb_release can be optained from:"
 	echo "I:   http://www.linux-foundation.org/en/LSB"
 	echo "I: On Debian based systems, lsb_release can be installed with:"
-	echo "I:   apt-get install lsb-release"
+	echo "I:   sudo apt-get install lsb-release"
 	exit 1
 fi
 
 _DISTRIBUTION="$(lsb_release -is | tr [A-Z] [a-z])"
 _RELEASE="$(lsb_release -cs | tr [A-Z] [a-z])"
 
-echo "Removing unused scripts..."
-
 case "${_DISTRIBUTION}" in
 	debian)
-		# Removing ubuntu scripts
-		rm -f "${_DIRECTORY}"/*-apport
-		rm -f "${_DIRECTORY}"/*-ureadahead
-		;;
-
-	progress)
-		# Removing ubuntu scripts
-		rm -f "${_DIRECTORY}"/*-upstart
-		rm -f "${_DIRECTORY}"/*-apport
-		rm -f "${_DIRECTORY}"/*-ureadahead
-		;;
-
-	ubuntu)
-		# Removing debian scripts
-		rm -f "${_DIRECTORY}"/*-gdm3
-		;;
-esac
-
-echo "Setting distribution specific defaults..."
+		NOSCRIPTS="apport ureadahead"
 
-case "${_DISTRIBUTION}" in
-	debian)
 		LIVE_HOSTNAME="debian"
 		LIVE_USERNAME="user"
 		LIVE_USER_FULLNAME="Debian Live user"
+		LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor"
 
 		case "${_RELEASE}" in
 			squeeze)
 				LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth"
 				;;
-
-			*)
-				LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor"
-				;;
 		esac
 		;;
 
 	progress)
+		NOSCRIPTS="upstart apport ureadahead"
+
 		LIVE_HOSTNAME="progress"
 		LIVE_USERNAME="user"
 		LIVE_USER_FULLNAME="Progress Linux user"
+		LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor sudo"
 
 		case "${_RELEASE}" in
-			artax)
+			artax|artax-backports)
 				LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth sudo"
 				;;
-
-			*)
-				LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor sudo"
-				;;
 		esac
 		;;
 
 	ubuntu)
+		NOSCRIPTS="gdm3"
+
 		LIVE_HOSTNAME="ubuntu"
 		LIVE_USERNAME="user"
 		LIVE_USER_FULLNAME="Ubuntu Live user"
+		LIVE_USER_DEFAULT_GROUPS="adm cdrom dip lpadmin plugdev sambashare"
 		;;
 esac
 
+echo "Removing unused scripts..."
+
+for NOSCRIPT in ${NOSCRIPTS}
+do
+	if ls "${_DIRECTORY}"/*-"${NOSCRIPT}" > /dev/null 2>&1
+	then
+		rm -f "${_DIRECTORY}"/*-"${NOSCRIPT}"
+	fi
+done
+
+echo  "Setting distribution specific defaults..."
+
 sed -i  -e "s|^LIVE_HOSTNAME=.*$|LIVE_HOSTNAME=\"${LIVE_HOSTNAME}\"|" \
 	-e "s|^LIVE_USERNAME=.*$|LIVE_USERNAME=\"${LIVE_USERNAME}\"|" \
 	-e "s|^LIVE_USER_FULLNAME=.*$|LIVE_USER_FULLNAME=\"${LIVE_USER_FULLNAME}\"|" \
diff --git a/examples/README b/examples/README
index 8e47059..ec8761a 100644
--- a/examples/README
+++ b/examples/README
@@ -12,4 +12,4 @@ point. The following things should minimally be changed:
   * Replace any mentioning of 'foobar', 'Foobar' and 'FOOBAR' with the name of
     your custom script or project name.
 
- -- Daniel Baumann <daniel at debian.org>  Mon, 24 May 2010 09:14:49 +0200
+ -- Daniel Baumann <daniel at debian.org>  Sun, 26 Feb 2012 21:15:40 +0100
diff --git a/examples/live-config-foobar/configs/foobar.conf b/examples/live-config-foobar/configs/foobar.conf
index c3c1213..48a5fce 100644
--- a/examples/live-config-foobar/configs/foobar.conf
+++ b/examples/live-config-foobar/configs/foobar.conf
@@ -1,3 +1,12 @@
 # /etc/live/config.conf.d/foobar.conf
 
+## live-config-foobar(7) - Additional Configuration Scripts for Debian Live
+## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+## Copyright (C) 2012 John Doe <john at example.org>
+##
+## live-config-foobar comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
 LIVE_FOOBAR="foobar"
diff --git a/examples/live-config-foobar/debian/changelog b/examples/live-config-foobar/debian/changelog
index 67a2244..fd83209 100644
--- a/examples/live-config-foobar/debian/changelog
+++ b/examples/live-config-foobar/debian/changelog
@@ -1,5 +1,6 @@
 live-config-foobar (1-1) unstable; urgency=low
 
-  * Initial release.
+  * Initial release based on the live-config-foobar example package
+    included in live-config.
 
- -- John Doe <john at example.org>  Tue, 11 Jan 2011 14:44:37 +0100
+ -- John Doe <john at example.org>  Sun, 26 Feb 2012 21:15:40 +0100
diff --git a/examples/live-config-foobar/debian/compat b/examples/live-config-foobar/debian/compat
index 45a4fb7..ec63514 100644
--- a/examples/live-config-foobar/debian/compat
+++ b/examples/live-config-foobar/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/examples/live-config-foobar/debian/control b/examples/live-config-foobar/debian/control
index fb52cbd..d50157d 100644
--- a/examples/live-config-foobar/debian/control
+++ b/examples/live-config-foobar/debian/control
@@ -2,8 +2,8 @@ Source: live-config-foobar
 Section: misc
 Priority: optional
 Maintainer: John Doe <john at example.org>
-Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
 Homepage: http://www.example.org/foobar/
 Vcs-Browser: http://git.example.org/?p=live-config-foobar.git
 Vcs-Git: git://git.example.org/git/live-config-foobar.git
diff --git a/examples/live-config-foobar/debian/copyright b/examples/live-config-foobar/debian/copyright
index e9c31c5..2e4bdd5 100644
--- a/examples/live-config-foobar/debian/copyright
+++ b/examples/live-config-foobar/debian/copyright
@@ -1,8 +1,17 @@
-This package is based on the live-config-foobar example package included in
-live-config which can be optained from http://live.debian.net/.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: live-config-foobar
+Upstream-Contact: John Doe <john at example.org>
+Source: http://www.example.org/foobar/
+Disclaimer:
+ This package is based on the live-config-foobar example package
+ included in live-config which can be optained from
+ http://live.debian.net/devel/live-config/.
 
 Files: *
-Copyright: (C) 2011 John Doe <john at example.org>
+Copyright: 2006-2012 Daniel Baumann <daniel at debian.org>
+           2012 John Doe <john at example.org>
+License: GPL-3+
+
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/examples/live-config-foobar/scripts/900-foobar b/examples/live-config-foobar/scripts/900-foobar
index f58a2cb..a623b9c 100755
--- a/examples/live-config-foobar/scripts/900-foobar
+++ b/examples/live-config-foobar/scripts/900-foobar
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 ## live-config-foobar(7) - Additional Configuration Scripts for Debian Live
-## Copyright (C) 2011 John Doe <john at example.org>
+## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+## Copyright (C) 2012 John Doe <john at example.org>
 ##
 ## live-config-foobar comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/manpages/Makefile b/manpages/Makefile
index 3b8b063..2a5c1fb 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -1,5 +1,13 @@
 # Makefile
 
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
 SHELL := sh -e
 
 LANGUAGES = $(shell cd po && ls)
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index b34c811..f45d312 100755
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -1,5 +1,13 @@
 #!/bin/sh
 
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
 set -e
 
 DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 374d2da..92af4f0 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 2012\-02\-06 3.0~a32 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 18.03.2012 3.0~a33\-1 "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 8834a84..c37bbd8 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 2012\-02\-06 3.0~a32 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-03\-18 3.0~a33-1 "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 65aac87..8e1045d 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 2012\-02\-06 3.0~a32 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 18.03.2011 3.0~a33\-1 "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 cc61fb2..0bf6f41 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 2012\-02\-06 3.0~a32 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 18.03.2012 3.0~a33\-1 "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 542af75..f717bc9 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 2012\-02\-06 3.0~a32 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 18\-03\-2012 3.0~a33\-1 "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 f7f35e8..6b9b7f6 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~a30\n"
-"POT-Creation-Date: 2012-02-06 23:30+0100\n"
+"POT-Creation-Date: 2012-03-18 14:26+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,17 +23,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "2011-12-04"
-msgid "2012-02-06"
-msgstr "04.12.2011"
+#, no-wrap
+msgid "2012-03-18"
+msgstr "18.03.2012"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "3.0~a31"
-msgid "3.0~a32"
-msgstr "3.0~a31"
+#, no-wrap
+msgid "3.0~a33-1"
+msgstr "3.0~a33-1"
 
 #. 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 d76885d..b772c88 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a30\n"
-"POT-Creation-Date: 2012-02-06 23:30+0100\n"
+"POT-Creation-Date: 2012-03-18 14:26+0100\n"
 "PO-Revision-Date: 2011-12-06 17:47+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -25,17 +25,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "2011-12-04"
-msgid "2012-02-06"
-msgstr "04.12.2011"
+#, no-wrap
+msgid "2012-03-18"
+msgstr "18.03.2011"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "3.0~a31"
-msgid "3.0~a32"
-msgstr "3.0~a31"
+#, no-wrap
+msgid "3.0~a33-1"
+msgstr "3.0~a33-1"
 
 #. 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 cb57c0f..36c7c2c 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~a30\n"
-"POT-Creation-Date: 2012-02-06 23:30+0100\n"
+"POT-Creation-Date: 2012-03-18 14:26+0100\n"
 "PO-Revision-Date: 2011-12-06 18:02+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -24,17 +24,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "2011-12-04"
-msgid "2012-02-06"
-msgstr "04.12.2011"
+#, no-wrap
+msgid "2012-03-18"
+msgstr "18.03.2012"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "3.0~a31"
-msgid "3.0~a32"
-msgstr "3.0~a31"
+#, no-wrap
+msgid "3.0~a33-1"
+msgstr "3.0~a33-1"
 
 #. 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 b7ffaa1..4c99031 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~a30\n"
-"POT-Creation-Date: 2012-02-06 23:30+0100\n"
+"POT-Creation-Date: 2012-03-18 14:26+0100\n"
 "PO-Revision-Date: 2011-12-06 08:01+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -22,17 +22,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "2011-12-04"
-msgid "2012-02-06"
-msgstr "04-12-2011"
+#, no-wrap
+msgid "2012-03-18"
+msgstr "18-03-2012"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "3.0~a31"
-msgid "3.0~a32"
-msgstr "3.0~a31"
+#, no-wrap
+msgid "3.0~a33-1"
+msgstr "3.0~a33-1"
 
 #. 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 31a90db..560deca 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~a30\n"
-"POT-Creation-Date: 2012-02-06 23:30+0100\n"
+"POT-Creation-Date: 2012-03-18 14:26+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,17 +22,15 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "2011-12-04"
-msgid "2012-02-06"
-msgstr "04-12-2011"
+#, no-wrap
+msgid "2012-03-18"
+msgstr "18-03-2012"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "3.0~a31"
-msgid "3.0~a32"
-msgstr "3.0~a31"
+#, no-wrap
+msgid "3.0~a33-1"
+msgstr "3.0~a33-1"
 
 #. type: TH
 #: en/live-config.7:9
@@ -383,11 +381,11 @@ msgstr "B<live-config.xorg-resolution>=I<RESOLUÇÃO_DO_XORG> | B<xorg-resolutio
 
 #. type: Plain text
 #: en/live-config.7:67
-#, fuzzy
-#| msgid "Allows to set xorg resolution instead of autodetecting it."
 msgid ""
 "Allows to set xorg resolution instead of autodetecting it, e.g. 1024x768."
-msgstr "Permite definir a resolução do xorg ao invés de auto-detectá-la."
+msgstr ""
+"Permite definir a resolução do xorg ao invés de auto-detectá-la, por "
+"exemplo, 1024x768."
 
 #. type: IP
 #: en/live-config.7:67
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index bfa516d..3c59cde 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-02-06 23:30+0100\n"
+"POT-Creation-Date: 2012-03-18 14:26+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 "2012-02-06"
+msgid "2012-03-18"
 msgstr ""
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0~a32"
+msgid "3.0~a33-1"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 9cc04b5..9680ece 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 2012\-02\-06 3.0~a32 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 18\-03\-2012 3.0~a33\-1 "Projeto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Scripts para Configuração do Sistema
@@ -96,7 +96,8 @@ update\-alternatives.
 .IP "\fBlive\-config.xorg\-driver\fP=\fIDRIVER_DO_XORG\fP | \fBxorg\-driver\fP=\fIDRIVER_DO_XORG\fP" 4
 Permite definir o driver do xorg ao invés de auto\-detectá\-lo.
 .IP "\fBlive\-config.xorg\-resolution\fP=\fIRESOLUÇÃO_DO_XORG\fP | \fBxorg\-resolution\fP=\fIRESOLUÇÃO_DO_XORG\fP" 4
-Allows to set xorg resolution instead of autodetecting it, e.g. 1024x768.
+Permite definir a resolução do xorg ao invés de auto\-detectá\-la, por
+exemplo, 1024x768.
 .IP "\fBlive\-config.hooks\fP=filesystem|medium|\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP | \fBhooks\fP=medium|filesystem|\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
 Permite obter e executar um ou mais arquivos arbitrários. Note que as URLs
 precisam ser acessíveis por wget (http, ftp ou file://), que os arquivos são
diff --git a/scripts/config/014-xinit b/scripts/config/014-xinit
index dfe101c..9460cab 100755
--- a/scripts/config/014-xinit
+++ b/scripts/config/014-xinit
@@ -43,7 +43,12 @@ if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
 then
 	while true
 	do
-		startx
+		if grep -qs quiet /proc/cmdline
+		then
+			startx > /dev/null 2>&1
+		else
+			startx
+		fi
 	done
 fi
 EOF
diff --git a/scripts/config/118-openssh-server b/scripts/config/118-openssh-server
index c0264e2..0e44525 100755
--- a/scripts/config/118-openssh-server
+++ b/scripts/config/118-openssh-server
@@ -38,6 +38,14 @@ Configure_openssh_server ()
 		_SSH="true"
 	fi
 
+	if [ -e /run ] && [ ! -e /etc/ssh/ssh_host_ecdsa_key ]
+	then
+		# FIXME: use some better >= wheezy detection than existence of /run
+		ssh-keygen -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t ecdsa
+
+		_SSH="true"
+	fi
+
 	if [ "${_SSH}" = "true" ]
 	then
 		# Creating state file

-- 
live-config



More information about the debian-live-changes mailing list