Skip to content

Commit

Permalink
Adding upstream version 3.0~b11.
Browse files Browse the repository at this point in the history
  • Loading branch information
@daniel-baumann
daniel-baumann committed Jan 2, 2013
1 parent 1b8a997 commit 8736db7
Show file tree
Hide file tree
Showing 15 changed files with 61 additions and 54 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
@@ -1 +1 @@
3.0~b10-1
3.0~b11-1
8 changes: 6 additions & 2 deletions backends/initramfs-tools/live.hook
View file
Expand Up @@ -150,8 +150,12 @@ copy_exec /bin/mount /bin/mount.util-linux
[ "${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 ]
Expand Down
2 changes: 1 addition & 1 deletion manpages/de/live-boot.de.7
View file
Expand Up @@ -3,7 +3,7 @@
.\" 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
Expand Down
2 changes: 1 addition & 1 deletion manpages/de/persistence.conf.de.5
View file
Expand Up @@ -3,7 +3,7 @@
.\" 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
Expand Down
2 changes: 1 addition & 1 deletion manpages/en/live-boot.7
View file
@@ -1,4 +1,4 @@
.TH LIVE\-BOOT 7 2012\-12\-17 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\fR \- System Boot Scripts
Expand Down
2 changes: 1 addition & 1 deletion manpages/en/persistence.conf.5
View file
@@ -1,4 +1,4 @@
.TH LIVE\-BOOT conf 2012\-12\-17 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\fR \- Configuration file for persistence media in
Expand Down
2 changes: 1 addition & 1 deletion manpages/es/live-boot.es.7
View file
Expand Up @@ -3,7 +3,7 @@
.\" 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
Expand Down
2 changes: 1 addition & 1 deletion manpages/es/persistence.conf.es.5
View file
Expand Up @@ -3,7 +3,7 @@
.\" 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
Expand Down
12 changes: 6 additions & 6 deletions manpages/po/de/live-boot.7.po
View file
Expand Up @@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~b10-1\n"
"POT-Creation-Date: 2012-12-17 20:23+0100\n"
"Project-Id-Version: live-boot 3.0~b11-1\n"
"POT-Creation-Date: 2013-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"
Expand All @@ -24,14 +24,14 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-12-17"
msgstr "17.12.2012"
msgid "2013-01-02"
msgstr ""

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b10-1"
msgstr "3.0~b10-1"
msgid "3.0~b11-1"
msgstr "3.0~b11-1"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
Expand Down
12 changes: 6 additions & 6 deletions manpages/po/de/persistence.conf.5.po
View file
Expand Up @@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~b10-1\n"
"POT-Creation-Date: 2012-12-17 20:23+0100\n"
"Project-Id-Version: live-boot 3.0~b11-1\n"
"POT-Creation-Date: 2013-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"
Expand All @@ -24,14 +24,14 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-12-17"
msgstr "17.12.2012"
msgid "2013-01-02"
msgstr ""

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b10-1"
msgstr "3.0~b10-1"
msgid "3.0~b11-1"
msgstr "3.0~b11-1"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
Expand Down
12 changes: 6 additions & 6 deletions manpages/po/es/live-boot.7.po
View file
Expand Up @@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~b10-1\n"
"POT-Creation-Date: 2012-12-17 20:23+0100\n"
"Project-Id-Version: live-boot 3.0~b11-1\n"
"POT-Creation-Date: 2013-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"
Expand All @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-12-17"
msgstr "17.12.2012"
msgid "2013-01-02"
msgstr ""

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b10-1"
msgstr "3.0~b10-1"
msgid "3.0~b11-1"
msgstr "3.0~b11-1"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
Expand Down
12 changes: 6 additions & 6 deletions manpages/po/es/persistence.conf.5.po
View file
Expand Up @@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~b10-1\n"
"POT-Creation-Date: 2012-12-17 20:23+0100\n"
"Project-Id-Version: live-boot 3.0~b11-1\n"
"POT-Creation-Date: 2013-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"
Expand All @@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-12-17"
msgstr "17.12.2012"
msgid "2013-01-02"
msgstr ""

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b10-1"
msgstr "3.0~b10-1"
msgid "3.0~b11-1"
msgstr "3.0~b11-1"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
Expand Down
6 changes: 3 additions & 3 deletions manpages/pot/live-boot.7.pot
View file
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
"POT-Creation-Date: 2012-12-17 20:23+0100\n"
"POT-Creation-Date: 2013-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"
Expand All @@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-12-17"
msgid "2013-01-02"
msgstr ""

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b10-1"
msgid "3.0~b11-1"
msgstr ""

#. type: TH
Expand Down
6 changes: 3 additions & 3 deletions manpages/pot/persistence.conf.5.pot
View file
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
"POT-Creation-Date: 2012-12-17 20:23+0100\n"
"POT-Creation-Date: 2013-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"
Expand All @@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-12-17"
msgid "2013-01-02"
msgstr ""

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b10-1"
msgid "3.0~b11-1"
msgstr ""

#. type: TH
Expand Down
33 changes: 18 additions & 15 deletions scripts/boot/3010-verify-checksums
View file
Expand Up @@ -38,26 +38,29 @@ Verify_checksums ()

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
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
done
done

log_end_msg
Expand Down

0 comments on commit 8736db7

Please sign in to comment.