[SCM] live-config branch, debian-next, updated. debian/2.0_a2-1-5-g2fc0fb4
Daniel Baumann
daniel at debian.org
Fri May 28 19:46:20 UTC 2010
The following commit has been merged in the debian-next branch:
commit 8acb76d71c309e6947a800f9e5f755ae7cc6796a
Author: Daniel Baumann <daniel at debian.org>
Date: Fri May 28 19:33:01 2010 +0200
Adding live-noconfig option to exclude specific scripts from being run (Closes: #583533).
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 1696b31..0bacbb2 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 2010\-05\-28 2.0~a2 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 28.05.2010 2.0~a2 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -23,9 +23,9 @@ konfiguriert werden.
benutzt wird.
.PP
Wird kein Skript angegeben (standard), dann werden alle Skripte
-ausgefuehrt. Das ist dasselbe wie 'live\-config=all'.
+ausgefuehrt.
.PP
-Falls kein Script ausgefuehrt werden soll, kann 'live\-config=none' verwendet
+Falls kein Script ausgefuehrt werden soll, kann 'live\-noconfig' verwendet
werden.
.PP
Wenn bestimmte Skripte angegeben wurden, dann werden nur diese
@@ -50,7 +50,7 @@ fuegt das Live Benutzerkonto hinzu.
.IP \fBsudo\fP 4
raeumt dem Live Benutzer sudo Privilegien ein.
.IP \fBlocales\fP 4
-configures locales.
+konfiguriert locales.
.IP \fBtzdata\fP 4
konfiguriert /etc/timezone.
.IP \fBgdm\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 6c65e99..90d9625 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -12,9 +12,9 @@
.SS Kernel Parameters
\fBlive\-config\fR is only activated if 'live\-config', 'live\-config=\fISCRIPT\fR', or 'live\-config=\fISCRIPT1\fR,\fISCRIPT2\fR,...\fISCRIPTN\fR' was used as a kernel parameter.
.PP
-If no script is specified (default), then all scripts are executed. This is the same as using 'live\-config=all'.
+If no script is specified (default), then all scripts are executed.
.PP
-If no script should be execured, 'live\-config=none' can be used.
+If no script should be executed, 'live\-noconfig' can be used.
.PP
If some scripts are specified, then only those scripts are executed. Note that the order matters, e.g. 'live\-config=sudo,user-setup' would not work since the user needs to be added before it can be configured for sudo. Look at the filenames of the scripts in /lib/live/config for their ordering number.
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 6c252fb..9e54ca0 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 2.0~a1\n"
-"POT-Creation-Date: 2010-05-28 09:53+0300\n"
+"POT-Creation-Date: 2010-05-28 10:09+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"
@@ -23,10 +23,9 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:1
-#, fuzzy, no-wrap
-#| msgid "2010-05-27"
+#, no-wrap
msgid "2010-05-28"
-msgstr "27.05.2010"
+msgstr "28.05.2010"
#. type: TH
#: en/live-config.7:1
@@ -100,18 +99,15 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:16
-msgid ""
-"If no script is specified (default), then all scripts are executed. This is "
-"the same as using 'live-config=all'."
+msgid "If no script is specified (default), then all scripts are executed."
msgstr ""
"Wird kein Skript angegeben (standard), dann werden alle Skripte ausgefuehrt. "
-"Das ist dasselbe wie 'live-config=all'."
#. type: Plain text
#: en/live-config.7:18
-msgid "If no script should be execured, 'live-config=none' can be used."
+msgid "If no script should be executed, 'live-noconfig' can be used."
msgstr ""
-"Falls kein Script ausgefuehrt werden soll, kann 'live-config=none' verwendet "
+"Falls kein Script ausgefuehrt werden soll, kann 'live-noconfig' verwendet "
"werden."
#. type: Plain text
@@ -197,14 +193,12 @@ msgstr "raeumt dem Live Benutzer sudo Privilegien ein."
#: en/live-config.7:32
#, no-wrap
msgid "B<locales>"
-msgstr ""
+msgstr "B<locales>"
#. type: Plain text
#: en/live-config.7:34
-#, fuzzy
-#| msgid "configures /etc/timezone."
msgid "configures locales."
-msgstr "konfiguriert /etc/timezone."
+msgstr "konfiguriert locales."
#. type: IP
#: en/live-config.7:34
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 6bbdd54..c86852c 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-05-28 09:53+0300\n"
+"POT-Creation-Date: 2010-05-28 10:09+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"
@@ -92,14 +92,12 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:16
-msgid ""
-"If no script is specified (default), then all scripts are executed. This is "
-"the same as using 'live-config=all'."
+msgid "If no script is specified (default), then all scripts are executed."
msgstr ""
#. type: Plain text
#: en/live-config.7:18
-msgid "If no script should be execured, 'live-config=none' can be used."
+msgid "If no script should be executed, 'live-noconfig' can be used."
msgstr ""
#. type: Plain text
diff --git a/scripts/config.sh b/scripts/config.sh
index 652baaf..4d675a3 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -19,7 +19,17 @@ Cmdline ()
live-config=*)
# Only run requested scripts
- OPTIONS="${PARAMETER#live-config=}"
+ CONFIGS="${PARAMETER#live-config=}"
+ ;;
+
+ live-noconfig)
+ # Don't run any script
+ SCRIPTS=""
+ ;;
+
+ live-noconfig=*)
+ # Don't run requested scripts
+ NOCONFIGS="${PARAMETER#live-noconfig=}"
;;
# 001-hostname
@@ -58,12 +68,21 @@ Cmdline ()
esac
done
- # Assemble scripts selection
- if [ -z "${SCRIPTS}" ] && [ "${OPTIONS}" != "none" ]
+ # Include requested scripts
+ if [ -n "${CONFIGS}" ]
+ then
+ for CONFIG in $(echo ${CONFIGS} | sed -e 's|,| |g')
+ do
+ SCRIPTS="${SCRIPTS} $(ls /lib/live/config/???-${CONFIG})"
+ done
+ fi
+
+ # Exclude requested scripts
+ if [ -n "${NOCONFIGS}" ]
then
- for OPTION in $(echo ${OPTIONS} | sed -e 's|,| |g')
+ for NOCONFIG in $(echo ${NOCONFIGS} | sed -e 's|,| |g')
do
- SCRIPTS="${SCRIPTS} $(ls /lib/live/config/???-${OPTION})"
+ SCRIPTS="$(echo ${SCRIPTS} | sed -e "s|$(ls /lib/live/config/???-${NOCONFIG})||")"
done
fi
}
--
live-config
More information about the debian-live-changes
mailing list