[SCM] live-tools branch, upstream, updated. upstream/3.0.6-1-gbedcf72
Daniel Baumann
daniel at debian.org
Sun Aug 5 11:21:25 UTC 2012
The following commit has been merged in the upstream branch:
commit bedcf729fd8fcf4f456822ee1069b0834c1664df
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Aug 5 13:22:11 2012 +0200
Adding upstream version 3.0.7.
diff --git a/VERSION b/VERSION
index 3418252..4bf583f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.6-1
+3.0.7-1
diff --git a/bin/live-update-initramfs b/bin/live-update-initramfs
index 7f0f658..23656a4 100755
--- a/bin/live-update-initramfs
+++ b/bin/live-update-initramfs
@@ -10,21 +10,34 @@
set -e
-if grep -qs "boot=live" /proc/cmdline && \
- grep -qs "\/live\/image" /proc/mounts
+if grep -qs "boot=live" /proc/cmdline
then
- _DEVICE="$(awk '/\/live\/image/ { print $1 }' /proc/mounts)"
+ if grep -qs "\/live\/image" /proc/mounts
+ then
+ # live system with live media mounted as /live/image
+ _DEVICE="$(awk '/\/live\/image/ { print $1 }' /proc/mounts)"
- mount -o remount,rw ${_DEVICE} > /dev/null 2>&1 || true
+ mount -o remount,rw ${_DEVICE} > /dev/null 2>&1 || true
- if touch /live/image/.test > /dev/null 2>&1
- then
- _READ_WRITE="true"
+ if touch /live/image/.test > /dev/null 2>&1
+ then
+ _READ_WRITE="true"
- rm -f /live/image/.test
+ rm -f /live/image/.test
+ else
+ _READ_WRITE="false"
+ fi
else
- _READ_WRITE="false"
+ # live system without live media mounted as /live/image
+ echo "I: update-initramfs is disabled (live system is running without media mounted on /live/image)."
+
+ exit 0
fi
+else
+ # non-live system
+ /usr/sbin/update-initramfs.initramfs-tools "${@}"
+
+ exit "${?}"
fi
case "${_READ_WRITE}" in
diff --git a/manpages/ca/live-tools.ca.7 b/manpages/ca/live-tools.ca.7
index 1616ef9..fbefd80 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.6\-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.7\-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 11f19c9..c9b584c 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 04.08.2012 3.0.6\-1 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 05.08.2012 3.0.7\-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 dc8231c..cb56455 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\-04 3.0.6-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-08\-05 3.0.7-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 2cf84d1..2040187 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.6\-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.7\-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 afc78c2..70d73de 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.6\-1 "Projet Debian Live"
+.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.7\-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 ad7eefa..0cd59c2 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.6-1\n"
-"POT-Creation-Date: 2012-08-04 15:45+0300\n"
+"Project-Id-Version: live-tools 3.0.7-1\n"
+"POT-Creation-Date: 2012-08-05 13:19+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-04"
+msgid "2012-08-05"
msgstr "2012-07-31"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.6-1"
-msgstr "3.0.6-1"
+msgid "3.0.7-1"
+msgstr "3.0.7-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 0098087..bf40f36 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.6-1\n"
-"POT-Creation-Date: 2012-08-04 15:45+0300\n"
+"Project-Id-Version: live-tools 3.0.7-1\n"
+"POT-Creation-Date: 2012-08-05 13:19+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-04"
-msgstr "04.08.2012"
+msgid "2012-08-05"
+msgstr "05.08.2012"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.6-1"
-msgstr "3.0.6-1"
+msgid "3.0.7-1"
+msgstr "3.0.7-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 c9118a5..a04036a 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.6-1\n"
-"POT-Creation-Date: 2012-08-04 15:45+0300\n"
+"Project-Id-Version: live-tools 3.0.7-1\n"
+"POT-Creation-Date: 2012-08-05 13:19+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-04"
+msgid "2012-08-05"
msgstr "2012-07-31"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.6-1"
-msgstr "3.0.6-1"
+msgid "3.0.7-1"
+msgstr "3.0.7-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 87b1c24..35e297f 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.6-1\n"
-"POT-Creation-Date: 2012-08-04 15:45+0300\n"
+"Project-Id-Version: live-tools 3.0.7-1\n"
+"POT-Creation-Date: 2012-08-05 13:19+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-04"
+msgid "2012-08-05"
msgstr "2012-07-31"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.6-1"
-msgstr "3.0.6-1"
+msgid "3.0.7-1"
+msgstr "3.0.7-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 2adb6c9..3f78515 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-04 15:45+0300\n"
+"POT-Creation-Date: 2012-08-05 13:19+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-04"
+msgid "2012-08-05"
msgstr ""
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.6-1"
+msgid "3.0.7-1"
msgstr ""
#. type: TH
--
live-tools
More information about the debian-live-changes
mailing list