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:
1b8a997
)
Adding upstream version 3.0~b11.
upstream/3.0_b11
author
Daniel Baumann
<daniel@debian.org>
Wed, 2 Jan 2013 10:33:15 +0000
(11:33 +0100)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 2 Jan 2013 10:33:15 +0000
(11:33 +0100)
15 files changed:
VERSION
patch
|
blob
|
history
backends/initramfs-tools/live.hook
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/3010-verify-checksums
patch
|
blob
|
history
diff --git
a/VERSION
b/VERSION
index
a9134d7
..
7034a85
100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-3.0~b1
0
-1
+3.0~b1
1
-1
diff --git
a/backends/initramfs-tools/live.hook
b/backends/initramfs-tools/live.hook
index
c5b81b0
..
d66c669
100755
(executable)
--- a/
backends/initramfs-tools/live.hook
+++ b/
backends/initramfs-tools/live.hook
@@
-150,8
+150,12
@@
copy_exec /bin/mount /bin/mount.util-linux
[ "${QUIET}" ] || echo -n " utils"
# Feature: Verify Checksums
[ "${QUIET}" ] || echo -n " utils"
# Feature: Verify Checksums
-copy_exec /usr/bin/sha256sum /bin
-copy_exec /usr/bin/md5sum /bin
+if [ -e /etc/progress-linux_version ]
+then
+ copy_exec /usr/bin/sha256sum /bin
+else
+ copy_exec /usr/bin/md5sum /bin
+fi
# Program: memdisk
if [ -x /usr/bin/memdiskfind ]
# Program: memdisk
if [ -x /usr/bin/memdiskfind ]
diff --git
a/manpages/de/live-boot.de.7
b/manpages/de/live-boot.de.7
index
75370c5
..
0d8f5e3
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
17.12.2012 3.0~b10
\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7
2013\-01\-02 3.0~b11
\-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
4e46c7b
..
e5c4cef
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
17.12.2012 3.0~b10
\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf
2013\-01\-02 3.0~b11
\-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
04c1267
..
a46f1b5
100644
(file)
--- a/
manpages/en/live-boot.7
+++ b/
manpages/en/live-boot.7
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 7 201
2\-12\-17 3.0~b10
-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 201
3\-01\-02 3.0~b11
-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
e68f78a
..
f82d2e6
100644
(file)
--- a/
manpages/en/persistence.conf.5
+++ b/
manpages/en/persistence.conf.5
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT conf 201
2\-12\-17 3.0~b10
-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 201
3\-01\-02 3.0~b11
-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
1ceb651
..
be4eaa2
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
17.12.2012 3.0~b10
\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7
2013\-01\-02 3.0~b11
\-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
4f1b24a
..
a8034de
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
17.12.2012 3.0~b10
\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf
2013\-01\-02 3.0~b11
\-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
cf45c88
..
34c4d1b
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~b1
0
-1\n"
-"POT-Creation-Date: 201
2-12-17 20:23
+0100\n"
+"Project-Id-Version: live-boot 3.0~b1
1
-1\n"
+"POT-Creation-Date: 201
3-01-02 11:31
+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 "201
2-12-17
"
-msgstr "
17.12.2012
"
+msgid "201
3-01-02
"
+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 "3.0~b1
0
-1"
-msgstr "3.0~b1
0
-1"
+msgid "3.0~b1
1
-1"
+msgstr "3.0~b1
1
-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
477894c
..
23c15be
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 3.0~b1
0
-1\n"
-"POT-Creation-Date: 201
2-12-17 20:23
+0100\n"
+"Project-Id-Version: live-boot 3.0~b1
1
-1\n"
+"POT-Creation-Date: 201
3-01-02 11:31
+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 "201
2-12-17
"
-msgstr "
17.12.2012
"
+msgid "201
3-01-02
"
+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 "3.0~b1
0
-1"
-msgstr "3.0~b1
0
-1"
+msgid "3.0~b1
1
-1"
+msgstr "3.0~b1
1
-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
7ec45c9
..
5455005
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~b1
0
-1\n"
-"POT-Creation-Date: 201
2-12-17 20:23
+0100\n"
+"Project-Id-Version: live-boot 3.0~b1
1
-1\n"
+"POT-Creation-Date: 201
3-01-02 11:31
+0100\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/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "201
2-12-17
"
-msgstr "
17.12.2012
"
+msgid "201
3-01-02
"
+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 "3.0~b1
0
-1"
-msgstr "3.0~b1
0
-1"
+msgid "3.0~b1
1
-1"
+msgstr "3.0~b1
1
-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
0dd635c
..
ea087e0
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 3.0~b1
0
-1\n"
-"POT-Creation-Date: 201
2-12-17 20:23
+0100\n"
+"Project-Id-Version: live-boot 3.0~b1
1
-1\n"
+"POT-Creation-Date: 201
3-01-02 11:31
+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 "201
2-12-17
"
-msgstr "
17.12.2012
"
+msgid "201
3-01-02
"
+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 "3.0~b1
0
-1"
-msgstr "3.0~b1
0
-1"
+msgid "3.0~b1
1
-1"
+msgstr "3.0~b1
1
-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
caf9908
..
eb1bedd
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: 201
2-12-17 20:23
+0100\n"
+"POT-Creation-Date: 201
3-01-02 11:31
+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 "201
2-12-17
"
+msgid "201
3-01-02
"
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 "3.0~b1
0
-1"
+msgid "3.0~b1
1
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/manpages/pot/persistence.conf.5.pot
b/manpages/pot/persistence.conf.5.pot
index
cf77d83
..
bc3dc2f
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: 201
2-12-17 20:23
+0100\n"
+"POT-Creation-Date: 201
3-01-02 11:31
+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 "201
2-12-17
"
+msgid "201
3-01-02
"
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 "3.0~b1
0
-1"
+msgid "3.0~b1
1
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/scripts/boot/3010-verify-checksums
b/scripts/boot/3010-verify-checksums
index
8ccd663
..
08b2972
100755
(executable)
--- a/
scripts/boot/3010-verify-checksums
+++ b/
scripts/boot/3010-verify-checksums
@@
-38,26
+38,29
@@
Verify_checksums ()
for _DIGEST in $(echo ${LIVE_VERIFY_CHECKSUMS_DIGESTS} | sed -e 's|,| |g')
do
for _DIGEST in $(echo ${LIVE_VERIFY_CHECKSUMS_DIGESTS} | sed -e 's|,| |g')
do
- _CHECKSUMS="$(echo ${_DIGEST} | tr [a-z] [A-Z])SUMS"
+ _CHECKSUMS="$(echo ${_DIGEST} | tr [a-z] [A-Z])SUMS
${_DIGEST}sum.txt
"
- if [ -e "${_CHECKSUMS}" ]
- then
- echo "Found ${_CHECKSUMS}..." > "${_TTY}"
-
- if [ -e "/bin/${_DIGEST}sum" ]
+ for _CHECKSUM in ${_CHECKSUMS}
+ do
+ if [ -e "${_CHECKSUM}" ]
then
then
- echo "Checking ${_CHECKSUMS}..." > "${_TTY}"
+ echo "Found ${_CHECKSUM}..." > "${_TTY}"
+
+ if [ -e "/bin/${_DIGEST}sum" ]
+ then
+ echo "Checking ${_CHECKSUM}..." > "${_TTY}"
- # Verify checksums
-
/bin/${_DIGEST}sum -c "${_CHECKSUMS
}" < "${_TTY}" > "${_TTY}"
- _RETURN="${?}"
+
# Verify checksums
+
/bin/${_DIGEST}sum -c "${_CHECKSUM
}" < "${_TTY}" > "${_TTY}"
+
_RETURN="${?}"
- # Stop after first verification
- break
- else
- echo "Not found /bin/${_DIGEST}sum..." > "${_TTY}"
+ # Stop after first verification
+ break
+ else
+ echo "Not found /bin/${_DIGEST}sum..." > "${_TTY}"
+ fi
fi
fi
- fi
+ done
done
log_end_msg
done
log_end_msg