projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7bbaf49
)
Adding upstream version 4.0~a7.
upstream/4.0_a7
author
Daniel Baumann
<mail@daniel-baumann.ch>
Mon, 6 May 2013 12:37:12 +0000
(14:37 +0200)
committer
Daniel Baumann
<mail@daniel-baumann.ch>
Mon, 6 May 2013 12:37:12 +0000
(14:37 +0200)
15 files changed:
VERSION
patch
|
blob
|
history
manpages/de/live-boot.de.7
patch
|
blob
|
history
manpages/de/persistence.conf.de.5
patch
|
blob
|
history
manpages/en/live-boot.7
patch
|
blob
|
history
manpages/en/persistence.conf.5
patch
|
blob
|
history
manpages/es/live-boot.es.7
patch
|
blob
|
history
manpages/es/persistence.conf.es.5
patch
|
blob
|
history
manpages/po/de/live-boot.7.po
patch
|
blob
|
history
manpages/po/de/persistence.conf.5.po
patch
|
blob
|
history
manpages/po/es/live-boot.7.po
patch
|
blob
|
history
manpages/po/es/persistence.conf.5.po
patch
|
blob
|
history
manpages/pot/live-boot.7.pot
patch
|
blob
|
history
manpages/pot/persistence.conf.5.pot
patch
|
blob
|
history
scripts/boot/9990-misc-helpers.sh
patch
|
blob
|
history
scripts/boot/9990-overlay.sh
patch
|
blob
|
history
diff --git
a/VERSION
b/VERSION
index
0bc7477
..
2b29e05
100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-4.0~a
6
-1
+4.0~a
7
-1
diff --git
a/manpages/de/live-boot.de.7
b/manpages/de/live-boot.de.7
index
4505b32
..
7c5dc92
100644
(file)
--- 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.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 1
5.02.2013 4.0~a6
\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 1
9.02.2013 4.0~a7
\-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fP \- System Boot Scripts
.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
(file)
--- 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.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 1
5.02.2013 4.0~a6
\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 1
9.02.2013 4.0~a7
\-1 "Debian Live Project"
.SH NAME
\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
.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
(file)
--- a/
manpages/en/live-boot.7
+++ b/
manpages/en/live-boot.7
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 7 2013\-02\-1
5 4.0~a6
-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2013\-02\-1
9 4.0~a7
-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
.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
(file)
--- a/
manpages/en/persistence.conf.5
+++ b/
manpages/en/persistence.conf.5
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT conf 2013\-02\-1
5 4.0~a6
-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2013\-02\-1
9 4.0~a7
-1 "Debian Live Project"
.SH NAME
\fBpersistence.conf\fR \- Configuration file for persistence media in
.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
(file)
--- 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.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 1
5.02.2013 4.0~a6
\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 1
9.02.2013 4.0~a7
\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-boot\fP \- Scripts de Arranque del Sistema
.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
(file)
--- 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.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 1
5.02.2013 4.0~a6
\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 1
9.02.2013 4.0~a7
\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
.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
(file)
--- a/
manpages/po/de/live-boot.7.po
+++ b/
manpages/po/de/live-boot.7.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~a
6
-1\n"
-"POT-Creation-Date: 2013-02-1
5 08:56
+0100\n"
+"Project-Id-Version: live-boot 4.0~a
7
-1\n"
+"POT-Creation-Date: 2013-02-1
9 05:48
+0100\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
@@
-24,14
+24,14
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-02-1
5
"
-msgstr "1
5
.02.2013"
+msgid "2013-02-1
9
"
+msgstr "1
9
.02.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a
6
-1"
-msgstr "4.0~a
6
-1"
+msgid "4.0~a
7
-1"
+msgstr "4.0~a
7
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5: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
(file)
--- a/
manpages/po/de/persistence.conf.5.po
+++ b/
manpages/po/de/persistence.conf.5.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~a
6
-1\n"
-"POT-Creation-Date: 2013-02-1
5 08:56
+0100\n"
+"Project-Id-Version: live-boot 4.0~a
7
-1\n"
+"POT-Creation-Date: 2013-02-1
9 05:48
+0100\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
@@
-24,14
+24,14
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-02-1
5
"
-msgstr "1
5
.02.2013"
+msgid "2013-02-1
9
"
+msgstr "1
9
.02.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a
6
-1"
-msgstr "4.0~a
6
-1"
+msgid "4.0~a
7
-1"
+msgstr "4.0~a
7
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5: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
(file)
--- a/
manpages/po/es/live-boot.7.po
+++ b/
manpages/po/es/live-boot.7.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~a
6
-1\n"
-"POT-Creation-Date: 2013-02-1
5 08:56
+0100\n"
+"Project-Id-Version: live-boot 4.0~a
7
-1\n"
+"POT-Creation-Date: 2013-02-1
9 05:48
+0100\n"
"PO-Revision-Date: 2013-02-12 14:25+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-02-12 14:25+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\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
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-02-1
5
"
-msgstr "1
5
.02.2013"
+msgid "2013-02-1
9
"
+msgstr "1
9
.02.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a
6
-1"
-msgstr "4.0~a
6
-1"
+msgid "4.0~a
7
-1"
+msgstr "4.0~a
7
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5: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
(file)
--- a/
manpages/po/es/persistence.conf.5.po
+++ b/
manpages/po/es/persistence.conf.5.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~a
6
-1\n"
-"POT-Creation-Date: 2013-02-1
5 08:56
+0100\n"
+"Project-Id-Version: live-boot 4.0~a
7
-1\n"
+"POT-Creation-Date: 2013-02-1
9 05:48
+0100\n"
"PO-Revision-Date: 2012-06-07 19:11+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2012-06-07 19:11+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\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
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-02-1
5
"
-msgstr "1
5
.02.2013"
+msgid "2013-02-1
9
"
+msgstr "1
9
.02.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a
6
-1"
-msgstr "4.0~a
6
-1"
+msgid "4.0~a
7
-1"
+msgstr "4.0~a
7
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5: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
(file)
--- 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"
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2013-02-1
5 08:56
+0100\n"
+"POT-Creation-Date: 2013-02-1
9 05:48
+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-25,13
+25,13
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-02-1
5
"
+msgid "2013-02-1
9
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a
6
-1"
+msgid "4.0~a
7
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/manpages/pot/persistence.conf.5.pot
b/manpages/pot/persistence.conf.5.pot
index
8f593ca
..
e5b8b26
100644
(file)
--- 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"
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2013-02-1
5 08:56
+0100\n"
+"POT-Creation-Date: 2013-02-1
9 05:48
+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-25,13
+25,13
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-02-1
5
"
+msgid "2013-02-1
9
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a
6
-1"
+msgid "4.0~a
7
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/scripts/boot/9990-misc-helpers.sh
b/scripts/boot/9990-misc-helpers.sh
index
18befee
..
888eeaf
100755
(executable)
--- 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
# 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
}
fi
}
diff --git
a/scripts/boot/9990-overlay.sh
b/scripts/boot/9990-overlay.sh
index
71e9a74
..
10054e8
100755
(executable)
--- 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
# 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
}
}