Adding upstream version 4.0~a4.

diff --git a/VERSION b/VERSION
index 80ca3a5..ccb6a78 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a3-1
+4.0~a4-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
-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 ]

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 66b9582..7d0d9e2 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.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 17.12.2012 4.0~a3\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2013\-01\-02 4.0~a4\-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 3220327..ec7f232 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.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 17.12.2012 4.0~a3\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2013\-01\-02 4.0~a4\-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 5133be3..cb21e6e 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-12\-17 4.0~a3-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2013\-01\-02 4.0~a4-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 a9af086..46b4414 100644 (file)
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-12\-17 4.0~a3-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2013\-01\-02 4.0~a4-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 9f4bf38..89909eb 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.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 17.12.2012 4.0~a3\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 2013\-01\-02 4.0~a4\-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 766dc44..b499f3c 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.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 17.12.2012 4.0~a3\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 2013\-01\-02 4.0~a4\-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 1d0bf6b..7e7fcfc 100644 (file)
--- 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~a3-1\n"
-"POT-Creation-Date: 2012-12-17 20:26+0100\n"
+"Project-Id-Version: live-boot 4.0~a4-1\n"
+"POT-Creation-Date: 2013-01-02 11:36+0100\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
-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 "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-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 197310d..83ea2aa 100644 (file)
--- 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~a3-1\n"
-"POT-Creation-Date: 2012-12-17 20:26+0100\n"
+"Project-Id-Version: live-boot 4.0~a4-1\n"
+"POT-Creation-Date: 2013-01-02 11:36+0100\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
-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 "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-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 88742d7..f48b62b 100644 (file)
--- 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~a3-1\n"
-"POT-Creation-Date: 2012-12-17 20:26+0100\n"
+"Project-Id-Version: live-boot 4.0~a4-1\n"
+"POT-Creation-Date: 2013-01-02 11:36+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"
@@ -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 "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-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 e724c83..f7be839 100644 (file)
--- 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~a3-1\n"
-"POT-Creation-Date: 2012-12-17 20:26+0100\n"
+"Project-Id-Version: live-boot 4.0~a4-1\n"
+"POT-Creation-Date: 2013-01-02 11:36+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"
@@ -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 "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-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 c683032..3cdc773 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"
-"POT-Creation-Date: 2012-12-17 20:26+0100\n"
+"POT-Creation-Date: 2013-01-02 11:36+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"
@@ -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 "4.0~a3-1"
+msgid "4.0~a4-1"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index c6225ab..b26187d 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"
-"POT-Creation-Date: 2012-12-17 20:26+0100\n"
+"POT-Creation-Date: 2013-01-02 11:36+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"
@@ -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 "4.0~a3-1"
+msgid "4.0~a4-1"
 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
-               _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