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 (from parent 1:
e5efea9
)
Adding upstream version 3.0~a38.
upstream/3.0_a38
author
Daniel Baumann
<daniel@debian.org>
Thu, 26 Jul 2012 22:24:11 +0000
(
00:24
+0200)
committer
Daniel Baumann
<daniel@debian.org>
Thu, 26 Jul 2012 22:24:11 +0000
(
00:24
+0200)
17 files changed:
VERSION
patch
|
blob
|
history
manpages/bin/update-version.sh
patch
|
blob
|
history
manpages/de/live-boot.de.7
patch
|
blob
|
history
manpages/de/live-persistence.conf.de.5
patch
|
blob
|
history
manpages/en/live-boot.7
patch
|
blob
|
history
manpages/en/live-persistence.conf.5
patch
|
blob
|
history
manpages/es/live-boot.es.7
patch
|
blob
|
history
manpages/es/live-persistence.conf.es.5
patch
|
blob
|
history
manpages/po/de/live-boot.7.po
patch
|
blob
|
history
manpages/po/de/live-persistence.conf.5.po
patch
|
blob
|
history
manpages/po/es/live-boot.7.po
patch
|
blob
|
history
manpages/po/es/live-persistence.conf.5.po
patch
|
blob
|
history
manpages/pot/live-boot.7.pot
patch
|
blob
|
history
manpages/pot/live-persistence.conf.5.pot
patch
|
blob
|
history
scripts/boot/3010-verify-checksums
patch
|
blob
|
history
scripts/boot/9990-fstab.sh
patch
|
blob
|
history
scripts/boot/9990-netbase.sh
patch
|
blob
|
history
diff --git
a/VERSION
b/VERSION
index
ca7b780
..
cf9496d
100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-3.0~a3
7
-1
+3.0~a3
8
-1
diff --git
a/manpages/bin/update-version.sh
b/manpages/bin/update-version.sh
index
1765772
..
6326ada
100755
(executable)
--- a/
manpages/bin/update-version.sh
+++ b/
manpages/bin/update-version.sh
@@
-3,7
+3,7
@@
## live-boot(7) - System Boot Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
##
## live-boot(7) - System Boot Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
##
-##
live-boot
comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+##
This program
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.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff --git
a/manpages/de/live-boot.de.7
b/manpages/de/live-boot.de.7
index
94dfd6b
..
4e0d950
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 2
5.07.2012 3.0~a37
\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2
7.07.2012 3.0~a38
\-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/live-persistence.conf.de.5
b/manpages/de/live-persistence.conf.de.5
index
92571e4
..
79e62e7
100644
(file)
--- a/
manpages/de/live-persistence.conf.de.5
+++ b/
manpages/de/live-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 2
5.07.2012 3.0~a37
\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2
7.07.2012 3.0~a38
\-1 "Debian Live Project"
.SH NAME
\fBlive\-persistence.conf\fP \- Configuration file for persistence media in
.SH NAME
\fBlive\-persistence.conf\fP \- Configuration file for persistence media in
diff --git
a/manpages/en/live-boot.7
b/manpages/en/live-boot.7
index
14ffb43
..
670fc71
100644
(file)
--- a/
manpages/en/live-boot.7
+++ b/
manpages/en/live-boot.7
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 7 2012\-07\-2
5 3.0~a37
-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-07\-2
7 3.0~a38
-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/live-persistence.conf.5
b/manpages/en/live-persistence.conf.5
index
617ca64
..
18ae4c9
100644
(file)
--- a/
manpages/en/live-persistence.conf.5
+++ b/
manpages/en/live-persistence.conf.5
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT conf 2012\-07\-2
5 3.0~a37
-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-07\-2
7 3.0~a38
-1 "Debian Live Project"
.SH NAME
\fBlive-persistence.conf\fR \- Configuration file for persistence media in
.SH NAME
\fBlive-persistence.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
775985d
..
2dc590d
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 2
5.07.2012 3.0~a37
\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 2
7.07.2012 3.0~a38
\-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/live-persistence.conf.es.5
b/manpages/es/live-persistence.conf.es.5
index
4d00d54
..
e8a5f2d
100644
(file)
--- a/
manpages/es/live-persistence.conf.es.5
+++ b/
manpages/es/live-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 2
5.07.2012 3.0~a37
\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 2
7.07.2012 3.0~a38
\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento
.SH NOMBRE
\fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento
diff --git
a/manpages/po/de/live-boot.7.po
b/manpages/po/de/live-boot.7.po
index
61e2b4f
..
7d0eafa
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 3.0~a3
7
-1\n"
-"POT-Creation-Date: 2012-07-2
5 17
:21+0300\n"
+"Project-Id-Version: live-boot 3.0~a3
8
-1\n"
+"POT-Creation-Date: 2012-07-2
7 00
:21+0300\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,13
+24,13
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-2
5
"
-msgstr "2
5
.07.2012"
+msgid "2012-07-2
7
"
+msgstr "2
7
.07.2012"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "3.0~a3
7
-1"
+msgid "3.0~a3
8
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/manpages/po/de/live-persistence.conf.5.po
b/manpages/po/de/live-persistence.conf.5.po
index
3393a98
..
f098249
100644
(file)
--- a/
manpages/po/de/live-persistence.conf.5.po
+++ b/
manpages/po/de/live-persistence.conf.5.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a3
7
-1\n"
-"POT-Creation-Date: 2012-07-2
5 17
:21+0300\n"
+"Project-Id-Version: live-boot 3.0~a3
8
-1\n"
+"POT-Creation-Date: 2012-07-2
7 00
:21+0300\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,13
+24,13
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-2
5
"
-msgstr "2
5
.07.2012"
+msgid "2012-07-2
7
"
+msgstr "2
7
.07.2012"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "3.0~a3
7
-1"
+msgid "3.0~a3
8
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/manpages/po/es/live-boot.7.po
b/manpages/po/es/live-boot.7.po
index
754bede
..
a4c63df
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 3.0~a3
7
-1\n"
-"POT-Creation-Date: 2012-07-2
5 17
:21+0300\n"
+"Project-Id-Version: live-boot 3.0~a3
8
-1\n"
+"POT-Creation-Date: 2012-07-2
7 00
:21+0300\n"
"PO-Revision-Date: 2012-06-07 20:29+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2012-06-07 20:29+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
"Language-Team: none\n"
@@
-24,14
+24,14
@@
msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-2
5
"
-msgstr "2
5
.07.2012"
+msgid "2012-07-2
7
"
+msgstr "2
7
.07.2012"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "3.0~a3
7
-1"
-msgstr "3.0~a3
7
-1"
+msgid "3.0~a3
8
-1"
+msgstr "3.0~a3
8
-1"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
diff --git
a/manpages/po/es/live-persistence.conf.5.po
b/manpages/po/es/live-persistence.conf.5.po
index
2fdc97c
..
94c09a6
100644
(file)
--- a/
manpages/po/es/live-persistence.conf.5.po
+++ b/
manpages/po/es/live-persistence.conf.5.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a3
7
-1\n"
-"POT-Creation-Date: 2012-07-2
5 17
:21+0300\n"
+"Project-Id-Version: live-boot 3.0~a3
8
-1\n"
+"POT-Creation-Date: 2012-07-2
7 00
:21+0300\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/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-2
5
"
-msgstr "2
5
.07.2012"
+msgid "2012-07-2
7
"
+msgstr "2
7
.07.2012"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "3.0~a3
7
-1"
-msgstr "3.0~a3
7
-1"
+msgid "3.0~a3
8
-1"
+msgstr "3.0~a3
8
-1"
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
diff --git
a/manpages/pot/live-boot.7.pot
b/manpages/pot/live-boot.7.pot
index
6d7198d
..
ce3e428
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: 2012-07-2
5 17
:21+0300\n"
+"POT-Creation-Date: 2012-07-2
7 00
:21+0300\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/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-2
5
"
+msgid "2012-07-2
7
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "3.0~a3
7
-1"
+msgid "3.0~a3
8
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/manpages/pot/live-persistence.conf.5.pot
b/manpages/pot/live-persistence.conf.5.pot
index
575ca43
..
38b6190
100644
(file)
--- a/
manpages/pot/live-persistence.conf.5.pot
+++ b/
manpages/pot/live-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: 2012-07-2
5 17
:21+0300\n"
+"POT-Creation-Date: 2012-07-2
7 00
:21+0300\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/live-persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "2012-07-2
5
"
+msgid "2012-07-2
7
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1
#, no-wrap
-msgid "3.0~a3
7
-1"
+msgid "3.0~a3
8
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/scripts/boot/3010-verify-checksums
b/scripts/boot/3010-verify-checksums
index
cc4115d
..
3649e04
100755
(executable)
--- a/
scripts/boot/3010-verify-checksums
+++ b/
scripts/boot/3010-verify-checksums
@@
-7,6
+7,11
@@
Verify_checksums ()
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
+ live-boot.verify-checksums=*|verify-checksums=*)
+ LIVE_VERIFY_CHECKSUMS="true"
+ LIVE_VERIFY_CHECKSUMS_DIGESTS="${_PARAMETER#*verify-checksums=}"
+ ;;
+
live-boot.verify-checksums|verify-checksums)
LIVE_VERIFY_CHECKSUMS="true"
;;
live-boot.verify-checksums|verify-checksums)
LIVE_VERIFY_CHECKSUMS="true"
;;
@@
-20,14
+25,14
@@
Verify_checksums ()
_MOUNTPOINT="${1}"
_MOUNTPOINT="${1}"
-
_DIGESTS="sha512 sha384 sha256 sha224 sha1 md5
"
+
LIVE_VERIFY_CHECKSUMS_DIGESTS="${LIVE_VERIFY_CHECKSUMS_DIGESTS:-sha512 sha384 sha256 sha224 sha1 md5}
"
_TTY="/dev/tty8"
log_begin_msg "Verifying checksums"
cd "${_MOUNTPOINT}"
_TTY="/dev/tty8"
log_begin_msg "Verifying checksums"
cd "${_MOUNTPOINT}"
- for _DIGEST in $
{_DIGESTS}
+ for _DIGEST in $
(echo ${LIVE_VERIFY_CHECKSUMS_DIGESTS} | sed -e 's|,| |g')
do
_CHECKSUMS="$(echo ${_DIGEST} | tr [a-z] [A-Z])SUMS"
do
_CHECKSUMS="$(echo ${_DIGEST} | tr [a-z] [A-Z])SUMS"
diff --git
a/scripts/boot/9990-fstab.sh
b/scripts/boot/9990-fstab.sh
index
7f5459f
..
dc3f07b
100755
(executable)
--- a/
scripts/boot/9990-fstab.sh
+++ b/
scripts/boot/9990-fstab.sh
@@
-6,7
+6,7
@@
Fstab ()
{
# FIXME: stop hardcoding overloading of initramfs-tools functions
. /scripts/functions
{
# FIXME: stop hardcoding overloading of initramfs-tools functions
. /scripts/functions
- . /lib/live/boot/initramfs-tools.sh
+ . /lib/live/boot/
9990-
initramfs-tools.sh
if [ -n "${NOFSTAB}" ]
then
if [ -n "${NOFSTAB}" ]
then
diff --git
a/scripts/boot/9990-netbase.sh
b/scripts/boot/9990-netbase.sh
index
3f5f7af
..
c11b9df
100755
(executable)
--- a/
scripts/boot/9990-netbase.sh
+++ b/
scripts/boot/9990-netbase.sh
@@
-11,7
+11,7
@@
Netbase ()
# FIXME: stop hardcoding overloading of initramfs-tools functions
. /scripts/functions
# FIXME: stop hardcoding overloading of initramfs-tools functions
. /scripts/functions
- . /lib/live/boot/initramfs-tools.sh
+ . /lib/live/boot/
9990-
initramfs-tools.sh
log_begin_msg "Preconfiguring networking"
log_begin_msg "Preconfiguring networking"