From 0fe4dfe31285d1ee9c2ef07f41a4d4f3c9aca893 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 6 May 2013 14:37:12 +0200 Subject: [PATCH] Adding upstream version 4.0~a7. --- VERSION | 2 +- manpages/de/live-boot.de.7 | 2 +- manpages/de/persistence.conf.de.5 | 2 +- manpages/en/live-boot.7 | 2 +- manpages/en/persistence.conf.5 | 2 +- manpages/es/live-boot.es.7 | 2 +- manpages/es/persistence.conf.es.5 | 2 +- manpages/po/de/live-boot.7.po | 12 ++++++------ manpages/po/de/persistence.conf.5.po | 12 ++++++------ manpages/po/es/live-boot.7.po | 12 ++++++------ manpages/po/es/persistence.conf.5.po | 12 ++++++------ manpages/pot/live-boot.7.pot | 6 +++--- manpages/pot/persistence.conf.5.pot | 6 +++--- scripts/boot/9990-misc-helpers.sh | 2 +- scripts/boot/9990-overlay.sh | 2 +- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/VERSION b/VERSION index 0bc7477..2b29e05 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0~a6-1 +4.0~a7-1 diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 4505b32..7c5dc92 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 15.02.2013 4.0~a6\-1 "Debian Live Project" +.TH LIVE\-BOOT 7 19.02.2013 4.0~a7\-1 "Debian Live Project" .SH NAME \fBlive\-boot\fP \- System Boot Scripts diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5 index cc22a4f..f6ed65f 100644 --- a/manpages/de/persistence.conf.de.5 +++ b/manpages/de/persistence.conf.de.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 15.02.2013 4.0~a6\-1 "Debian Live Project" +.TH LIVE\-BOOT conf 19.02.2013 4.0~a7\-1 "Debian Live Project" .SH NAME \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 7e2b052..d995c77 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2013\-02\-15 4.0~a6-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2013\-02\-19 4.0~a7-1 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index a801a9a..63a2439 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2013\-02\-15 4.0~a6-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2013\-02\-19 4.0~a7-1 "Debian Live Project" .SH NAME \fBpersistence.conf\fR \- Configuration file for persistence media in diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index 4c72c3b..3a9c044 100644 --- a/manpages/es/live-boot.es.7 +++ b/manpages/es/live-boot.es.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 15.02.2013 4.0~a6\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT 7 19.02.2013 4.0~a7\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-boot\fP \- Scripts de Arranque del Sistema diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 9b4aede..8b624a6 100644 --- a/manpages/es/persistence.conf.es.5 +++ b/manpages/es/persistence.conf.es.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 15.02.2013 4.0~a6\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT conf 19.02.2013 4.0~a7\-1 "Proyecto Debian Live" .SH NOMBRE \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index e761dc0..c7f1c3d 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a6-1\n" -"POT-Creation-Date: 2013-02-15 08:56+0100\n" +"Project-Id-Version: live-boot 4.0~a7-1\n" +"POT-Creation-Date: 2013-02-19 05:48+0100\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-15" -msgstr "15.02.2013" +msgid "2013-02-19" +msgstr "19.02.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a6-1" -msgstr "4.0~a6-1" +msgid "4.0~a7-1" +msgstr "4.0~a7-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po index 5f3ac2b..7758741 100644 --- a/manpages/po/de/persistence.conf.5.po +++ b/manpages/po/de/persistence.conf.5.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a6-1\n" -"POT-Creation-Date: 2013-02-15 08:56+0100\n" +"Project-Id-Version: live-boot 4.0~a7-1\n" +"POT-Creation-Date: 2013-02-19 05:48+0100\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-15" -msgstr "15.02.2013" +msgid "2013-02-19" +msgstr "19.02.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a6-1" -msgstr "4.0~a6-1" +msgid "4.0~a7-1" +msgstr "4.0~a7-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index aeb65c0..3efe967 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a6-1\n" -"POT-Creation-Date: 2013-02-15 08:56+0100\n" +"Project-Id-Version: live-boot 4.0~a7-1\n" +"POT-Creation-Date: 2013-02-19 05:48+0100\n" "PO-Revision-Date: 2013-02-12 14:25+0100\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-15" -msgstr "15.02.2013" +msgid "2013-02-19" +msgstr "19.02.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a6-1" -msgstr "4.0~a6-1" +msgid "4.0~a7-1" +msgstr "4.0~a7-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index ded551e..30c2e23 100644 --- a/manpages/po/es/persistence.conf.5.po +++ b/manpages/po/es/persistence.conf.5.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a6-1\n" -"POT-Creation-Date: 2013-02-15 08:56+0100\n" +"Project-Id-Version: live-boot 4.0~a7-1\n" +"POT-Creation-Date: 2013-02-19 05:48+0100\n" "PO-Revision-Date: 2012-06-07 19:11+0200\n" "Last-Translator: Carlos Zuferri «chals» \n" "Language-Team: none\n" @@ -23,14 +23,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-15" -msgstr "15.02.2013" +msgid "2013-02-19" +msgstr "19.02.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a6-1" -msgstr "4.0~a6-1" +msgid "4.0~a7-1" +msgstr "4.0~a7-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index c919468..d4a5d3a 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2013-02-15 08:56+0100\n" +"POT-Creation-Date: 2013-02-19 05:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-15" +msgid "2013-02-19" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a6-1" +msgid "4.0~a7-1" msgstr "" #. type: TH diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index 8f593ca..e5b8b26 100644 --- a/manpages/pot/persistence.conf.5.pot +++ b/manpages/pot/persistence.conf.5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2013-02-15 08:56+0100\n" +"POT-Creation-Date: 2013-02-19 05:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-15" +msgid "2013-02-19" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a6-1" +msgid "4.0~a7-1" msgstr "" #. type: TH diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 18befee..888eeaf 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -608,7 +608,7 @@ load_keymap () # Load custom keymap if [ -x /bin/loadkeys -a -r /etc/boottime.kmap.gz ] then - loadkeys /etc/boottime.kmap.gz + loadkeys --quiet /etc/boottime.kmap.gz fi } diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index 71e9a74..10054e8 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -402,5 +402,5 @@ setup_unionfs () # ensure that a potentially stray tmpfs gets removed # otherways, initramfs-tools is unable to remove /live # and fails to boot - umount /live/overlay || true + umount /live/overlay > /dev/null 2>&1 || true } -- 2.1.4