[SCM] live-config branch, debian, updated. debian/2.0_a14-1-16-gd485a6f
Daniel Baumann
daniel at debian.org
Fri Jul 16 23:18:47 UTC 2010
The following commit has been merged in the debian branch:
commit 081269d975c6d25987f6a4f3b21e7a63e4492e7c
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jul 16 03:57:49 2010 +0200
Adding ureadahead script (ubuntu only).
diff --git a/bin/update-live-config.sh b/bin/update-live-config.sh
index 53c0020..ce31928 100755
--- a/bin/update-live-config.sh
+++ b/bin/update-live-config.sh
@@ -29,6 +29,7 @@ case "${_DISTRIBUTION}" in
debian)
# Removing ubuntu scripts
rm -f "${_DIRECTORY}"/*-apport
+ rm -f "${_DIRECTORY}"/*-ureadahead
case "${_RELEASE}" in
lenny)
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 2fbb969..0a57ab4 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -261,8 +261,8 @@ konfiguriert sysvinit.
konfiguriert sysv\-rc durch abschalten von angegebenen Services.
.IP \fBlogin\fP 4
schaltet lastlog ab.
-.IP \fBapport\fP 4
-aktiviert apport.
+.IP "\fBapport\fP (nur Ubuntu)" 4
+schaltet apport ab.
.IP \fBgnome\-panel\-data\fP 4
entfernt den Sperrknopf für den Bildschirm.
.IP \fBgnome\-power\-manager\fP 4
@@ -297,6 +297,8 @@ schaltet hwclock von util\-linux ab.
schaltet lastlog ab.
.IP \fBxserver\-xorg\fP 4
konfiguriert xserver\-xorg.
+.IP "\fBureadahead\fP (nur Ubuntu)" 4
+schaltet ureadahead ab.
.IP \fBhooks\fP 4
erlaubt beliebige Kommands von einem Skript auf dem Live Medium oder von
einem HTTP/FTP Server auszuführen.
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 5865b2d..5015a26 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -167,8 +167,8 @@ configures sysvinit.
configures sysv-rc by disabling listed services.
.IP "\fBlogin\fR" 4
disables lastlog.
-.IP "\fBapport\fR" 4
-enables apport.
+.IP "\fBapport\fR (ubuntu only)" 4
+disables apport.
.IP "\fBgnome\-panel\-data\fR" 4
disables lock button for the screen.
.IP "\fBgnome\-power\-manager\fR" 4
@@ -201,6 +201,8 @@ disables util-linux' hwclock.
disables lastlog.
.IP "\fBxserver\-xorg\fR" 4
configures xserver-xorg.
+.IP "\fBureadahead\fR (ubuntu only)" 4
+disables ureadahead.
.IP "\fBhooks\fR" 4
allows to run arbitrary commands from a script placed on the live media or an http/ftp server.
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 2e668d9..c0bc3b8 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -256,8 +256,8 @@ configure sysvinit.
configure sysv\-rc en désactivant les services listés.
.IP \fBlogin\fP 4
désactive lastlog.
-.IP \fBapport\fP 4
-enables apport.
+.IP "\fBapport\fP (seulement ubuntu)" 4
+désactive apport.
.IP \fBgnome\-panel\-data\fP 4
désactive le bouton de verrouillage de l'écran.
.IP \fBgnome\-power\-manager\fP 4
@@ -292,6 +292,8 @@ désactive util\-linux' heure hardware.
désactive lastlog.
.IP \fBxserver\-xorg\fP 4
configure xserver\-xorg.
+.IP "\fBureadahead\fP (seulement ubuntu)" 4
+désactive ureadahead.
.IP \fBhooks\fP 4
permet de lancer des commandes particulières depuis un script placés sur le
média live, ou sur un serveur http/ftp.
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index e20b0cc..57df851 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~a14\n"
-"POT-Creation-Date: 2010-07-16 01:43+0300\n"
+"POT-Creation-Date: 2010-07-16 03:55+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"
@@ -29,6 +29,7 @@ msgstr "16.07.2010"
#. type: TH
#: en/live-config.7:9
+#, no-wrap
msgid "2.0~a14"
msgstr "2.0~a14"
@@ -1038,13 +1039,13 @@ msgstr "schaltet lastlog ab."
#. type: IP
#: en/live-config.7:170
#, no-wrap
-msgid "B<apport>"
-msgstr "B<apport>"
+msgid "B<apport> (ubuntu only)"
+msgstr "B<apport> (nur Ubuntu)"
#. type: Plain text
#: en/live-config.7:172
-msgid "enables apport."
-msgstr "aktiviert apport."
+msgid "disables apport."
+msgstr "schaltet apport ab."
#. type: IP
#: en/live-config.7:172
@@ -1218,11 +1219,22 @@ msgstr "konfiguriert xserver-xorg."
#. type: IP
#: en/live-config.7:204
#, no-wrap
+msgid "B<ureadahead> (ubuntu only)"
+msgstr "B<ureadahead> (nur Ubuntu)"
+
+#. type: Plain text
+#: en/live-config.7:206
+msgid "disables ureadahead."
+msgstr "schaltet ureadahead ab."
+
+#. type: IP
+#: en/live-config.7:206
+#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:206
+#: en/live-config.7:208
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1231,77 +1243,77 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:207
+#: en/live-config.7:209
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:208
+#: en/live-config.7:210
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:209
+#: en/live-config.7:211
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:211
+#: en/live-config.7:213
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:213
+#: en/live-config.7:215
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:216
+#: en/live-config.7:218
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:220
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:220
+#: en/live-config.7:222
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:221
+#: en/live-config.7:223
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:223
+#: en/live-config.7:225
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1312,13 +1324,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:224
+#: en/live-config.7:226
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:228
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1332,13 +1344,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:227
+#: en/live-config.7:229
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:230
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index ca8072b..180d685 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 2.0~a14\n"
-"POT-Creation-Date: 2010-07-16 01:43+0300\n"
+"POT-Creation-Date: 2010-07-16 03:55+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"
@@ -29,6 +29,7 @@ msgstr "16.07.2010"
#. type: TH
#: en/live-config.7:9
+#, no-wrap
msgid "2.0~a14"
msgstr "2.0~a14"
@@ -992,13 +993,13 @@ msgstr "désactive lastlog."
#. type: IP
#: en/live-config.7:170
#, no-wrap
-msgid "B<apport>"
-msgstr "B<apport>"
+msgid "B<apport> (ubuntu only)"
+msgstr "B<apport> (seulement ubuntu)"
#. type: Plain text
#: en/live-config.7:172
-msgid "enables apport."
-msgstr ""
+msgid "disables apport."
+msgstr "désactive apport."
#. type: IP
#: en/live-config.7:172
@@ -1172,11 +1173,22 @@ msgstr "configure xserver-xorg."
#. type: IP
#: en/live-config.7:204
#, no-wrap
+msgid "B<ureadahead> (ubuntu only)"
+msgstr "B<ureadahead> (seulement ubuntu)"
+
+#. type: Plain text
+#: en/live-config.7:206
+msgid "disables ureadahead."
+msgstr "désactive ureadahead."
+
+#. type: IP
+#: en/live-config.7:206
+#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:206
+#: en/live-config.7:208
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1185,77 +1197,77 @@ msgstr ""
"média live, ou sur un serveur http/ftp."
#. type: SH
-#: en/live-config.7:207
+#: en/live-config.7:209
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:208
+#: en/live-config.7:210
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:209
+#: en/live-config.7:211
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:211
+#: en/live-config.7:213
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:213
+#: en/live-config.7:215
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:216
+#: en/live-config.7:218
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:220
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:220
+#: en/live-config.7:222
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:221
+#: en/live-config.7:223
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:223
+#: en/live-config.7:225
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1266,13 +1278,13 @@ msgstr ""
"sur E<lt>I<http://live.debian.net/manual/>E<gt>."
#. type: SH
-#: en/live-config.7:224
+#: en/live-config.7:226
#, no-wrap
msgid "BUGS"
msgstr "BUGS"
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:228
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1285,13 +1297,13 @@ msgstr ""
"E<lt>I<debian-live at lists.debian.org>E<gt>"
#. type: SH
-#: en/live-config.7:227
+#: en/live-config.7:229
#, no-wrap
msgid "AUTHOR"
msgstr "AUTEUR"
#. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:230
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 9137093..974c0d2 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-07-16 01:43+0300\n"
+"POT-Creation-Date: 2010-07-16 03:55+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"
@@ -903,12 +903,12 @@ msgstr ""
#. type: IP
#: en/live-config.7:170
#, no-wrap
-msgid "B<apport>"
+msgid "B<apport> (ubuntu only)"
msgstr ""
#. type: Plain text
#: en/live-config.7:172
-msgid "enables apport."
+msgid "disables apport."
msgstr ""
#. type: IP
@@ -1080,88 +1080,99 @@ msgstr ""
#. type: IP
#: en/live-config.7:204
#, no-wrap
-msgid "B<hooks>"
+msgid "B<ureadahead> (ubuntu only)"
msgstr ""
#. type: Plain text
#: en/live-config.7:206
+msgid "disables ureadahead."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:206
+#, no-wrap
+msgid "B<hooks>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:208
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
msgstr ""
#. type: SH
-#: en/live-config.7:207
+#: en/live-config.7:209
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:208
+#: en/live-config.7:210
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:209
+#: en/live-config.7:211
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:211
+#: en/live-config.7:213
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:213
+#: en/live-config.7:215
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:216
+#: en/live-config.7:218
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:220
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:220
+#: en/live-config.7:222
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:221
+#: en/live-config.7:223
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:223
+#: en/live-config.7:225
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1169,13 +1180,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:224
+#: en/live-config.7:226
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:228
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1184,13 +1195,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:227
+#: en/live-config.7:229
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:230
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/scripts/config/100-apport b/scripts/config/117-ureadahead
similarity index 60%
copy from scripts/config/100-apport
copy to scripts/config/117-ureadahead
index 60ac506..6415e93 100755
--- a/scripts/config/100-apport
+++ b/scripts/config/117-ureadahead
@@ -8,27 +8,27 @@
## under certain conditions; see COPYING for details.
-Apport ()
+Ureadahead ()
{
# Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/apport.list ] || \
- [ -e /var/lib/live/apport ]
+ if [ ! -e /var/lib/dpkg/info/ureadahead.list ] || \
+ [ -e /var/lib/live/ureadahead ]
then
return
fi
- echo -n " apport"
+ echo -n " ureadahead"
- Configure_apport
+ Configure_ureadahead
}
-Configure_apport ()
+Configure_ureadahead ()
{
- # Enabling detection of crashes
- sed -i -e 's|enabled=0|enabled=1|' /etc/default/apport
+ # Disabling ureadahead
+ rm -f /etc/init/ureadahead*.conf
# Creating state file
- touch /var/lib/live/config/apport
+ touch /var/lib/live/config/ureadahead
}
-Apport
+Ureadahead
--
live-config
More information about the debian-live-changes
mailing list