[SCM] live-tools branch, upstream, updated. upstream/3.0.8-1-g679b3f3
Daniel Baumann
daniel at debian.org
Thu Aug 16 10:10:39 UTC 2012
The following commit has been merged in the upstream branch:
commit 679b3f3c978eff86cf6d06fba286fff56c83487a
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Aug 16 12:10:34 2012 +0200
Adding upstream version 3.0.9.
diff --git a/VERSION b/VERSION
index 73ad1a6..468137c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.8-1
+3.0.9-1
diff --git a/bin/live-update-initramfs b/bin/live-update-initramfs
index 23656a4..b0adfb6 100755
--- a/bin/live-update-initramfs
+++ b/bin/live-update-initramfs
@@ -10,6 +10,16 @@
set -e
+if [ ! -e /usr/sbin/update-initramfs.orig.initramfs-tools ]
+then
+ echo "E: /usr/sbin/update-initramfs.orig.initramfs-tools - command not found"
+ echo "E: On Debian based systems, update-initramfs from initramfs-tools"
+ echo "E: can be installed with:"
+ echo "E: apt-get install initramfs-tools"
+
+ exit 1
+fi
+
if grep -qs "boot=live" /proc/cmdline
then
if grep -qs "\/live\/image" /proc/mounts
@@ -35,7 +45,7 @@ then
fi
else
# non-live system
- /usr/sbin/update-initramfs.initramfs-tools "${@}"
+ /usr/sbin/update-initramfs.orig.initramfs-tools "${@}"
exit "${?}"
fi
@@ -43,7 +53,7 @@ fi
case "${_READ_WRITE}" in
true)
# Updating initramfs
- /usr/sbin/update-initramfs.initramfs-tools "${@}"
+ /usr/sbin/update-initramfs.orig.initramfs-tools "${@}"
# FIXME: needs to exclude initrd backup files
if [ "$(ls initrd.img-* | wc -l)" -gt 1 ]
diff --git a/bin/live-uptime b/bin/live-uptime
index 0e1af12..3f5c7ba 100755
--- a/bin/live-uptime
+++ b/bin/live-uptime
@@ -10,7 +10,17 @@
set -e
-_UPTIME="$(/usr/bin/uptime.procps)"
+if [ ! -e /usr/bin/uptime.orig.procps ]
+then
+ echo "E: /usr/bin/uptime.orig.procps - command not found"
+ echo "E: On Debian based systems, uptime from procps"
+ echo "E: can be installed with:"
+ echo "E: apt-get install procps"
+
+ exit 1
+fi
+
+_UPTIME="$(/usr/bin/uptime.orig.procps)"
_DATE_HOST="$(date +%s)"
diff --git a/manpages/ca/live-tools.ca.7 b/manpages/ca/live-tools.ca.7
index 3fc72a1..6bd73f2 100644
--- a/manpages/ca/live-tools.ca.7
+++ b/manpages/ca/live-tools.ca.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.8\-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.9\-1 "Debian Live Project"
.SH NOM
\fBlive\-tools\fP \- Scripts de Suport del Sistema
diff --git a/manpages/de/live-tools.de.7 b/manpages/de/live-tools.de.7
index 359a083..f4c3894 100644
--- a/manpages/de/live-tools.de.7
+++ b/manpages/de/live-tools.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 10.08.2012 3.0.8\-1 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 16.08.2012 3.0.9\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-tools\fP \- System Support Skripte
diff --git a/manpages/en/live-tools.7 b/manpages/en/live-tools.7
index b01d41b..9bacb12 100644
--- a/manpages/en/live-tools.7
+++ b/manpages/en/live-tools.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-TOOLS 7 2012\-08\-10 3.0.8-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-08\-16 3.0.9-1 "Debian Live Project"
.SH NAME
\fBlive\-tools\fR \- System Support Scripts
diff --git a/manpages/es/live-tools.es.7 b/manpages/es/live-tools.es.7
index 6924d9d..50d3644 100644
--- a/manpages/es/live-tools.es.7
+++ b/manpages/es/live-tools.es.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.8\-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.9\-1 "Debian Live Project"
.SH NOMBRE
\fBlive\-tools\fP \- Scripts de Apoyo del Sistema
diff --git a/manpages/fr/live-tools.fr.7 b/manpages/fr/live-tools.fr.7
index d964904..2ae0ee8 100644
--- a/manpages/fr/live-tools.fr.7
+++ b/manpages/fr/live-tools.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.8\-1 "Projet Debian Live"
+.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.9\-1 "Projet Debian Live"
.SH NOM
\fBlive\-tools\fP \- Scripts de Support du Système
diff --git a/manpages/po/ca/live-tools.7.po b/manpages/po/ca/live-tools.7.po
index 6650da7..3703b38 100644
--- a/manpages/po/ca/live-tools.7.po
+++ b/manpages/po/ca/live-tools.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 3.0.8-1\n"
-"POT-Creation-Date: 2012-08-10 22:27+0300\n"
+"Project-Id-Version: live-tools 3.0.9-1\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
"PO-Revision-Date: 2012-07-29 23:39+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-TOOLS"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-16"
msgstr "2012-07-31"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.8-1"
-msgstr "3.0.8-1"
+msgid "3.0.9-1"
+msgstr "3.0.9-1"
#. type: TH
#: en/live-tools.7:9
diff --git a/manpages/po/de/live-tools.7.po b/manpages/po/de/live-tools.7.po
index d97fb04..acb2023 100644
--- a/manpages/po/de/live-tools.7.po
+++ b/manpages/po/de/live-tools.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 3.0.8-1\n"
-"POT-Creation-Date: 2012-08-10 22:27+0300\n"
+"Project-Id-Version: live-tools 3.0.9-1\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-TOOLS"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-08-10"
-msgstr "10.08.2012"
+msgid "2012-08-16"
+msgstr "16.08.2012"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.8-1"
-msgstr "3.0.8-1"
+msgid "3.0.9-1"
+msgstr "3.0.9-1"
#. type: TH
#: en/live-tools.7:9
diff --git a/manpages/po/es/live-tools.7.po b/manpages/po/es/live-tools.7.po
index 9370b22..32cfe75 100644
--- a/manpages/po/es/live-tools.7.po
+++ b/manpages/po/es/live-tools.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 3.0.8-1\n"
-"POT-Creation-Date: 2012-08-10 22:27+0300\n"
+"Project-Id-Version: live-tools 3.0.9-1\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
"PO-Revision-Date: 2012-07-28 22:44+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-TOOLS"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-16"
msgstr "2012-07-31"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.8-1"
-msgstr "3.0.8-1"
+msgid "3.0.9-1"
+msgstr "3.0.9-1"
#. type: TH
#: en/live-tools.7:9
diff --git a/manpages/po/fr/live-tools.7.po b/manpages/po/fr/live-tools.7.po
index 00460b2..7aa0c21 100644
--- a/manpages/po/fr/live-tools.7.po
+++ b/manpages/po/fr/live-tools.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 3.0.8-1\n"
-"POT-Creation-Date: 2012-08-10 22:27+0300\n"
+"Project-Id-Version: live-tools 3.0.9-1\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
"PO-Revision-Date: 2012-07-31 00:29+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-TOOLS"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-16"
msgstr "2012-07-31"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.8-1"
-msgstr "3.0.8-1"
+msgid "3.0.9-1"
+msgstr "3.0.9-1"
#. type: TH
#: en/live-tools.7:9
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 14c1b67..36e85fc 100644
--- a/manpages/pot/live-tools.7.pot
+++ b/manpages/pot/live-tools.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:27+0300\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-16"
msgstr ""
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.8-1"
+msgid "3.0.9-1"
msgstr ""
#. type: TH
--
live-tools
More information about the debian-live-changes
mailing list