[SCM] live-boot branch, upstream, updated. upstream/2.0.11-1-g0200a64
Daniel Baumann
daniel at debian.org
Thu Dec 2 11:33:18 UTC 2010
The following commit has been merged in the upstream branch:
commit 0200a64bbb81fd8cf9b9ad7f2c72439c43235e39
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Dec 2 12:32:48 2010 +0100
Adding upstream version 2.0.12.
diff --git a/VERSION b/VERSION
index 6cbacdc..280a1e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.11
+2.0.12
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index ea0da23..fc57c3e 100644
--- 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 28.10.2010 2.0.11 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 22.11.2010 2.0.12 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 93ad776..47d8fb2 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 1 28.10.2010 2.0.11 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 22.11.2010 2.0.12 "Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 9625168..8cf2703 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-10\-28 2.0.11 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-11\-22 2.0.12 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 741fdd0..bf28893 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-10\-28 2.0.11 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-11\-22 2.0.12 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index a0316c4..12ef4af 100644
--- 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 2.0.11\n"
-"POT-Creation-Date: 2010-10-28 09:20+0300\n"
+"Project-Id-Version: live-boot 2.0.12\n"
+"POT-Creation-Date: 2010-11-22 23:27+0100\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-28"
-msgstr "28.10.2010"
+msgid "2010-11-22"
+msgstr "22.11.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.11"
-msgstr "2.0.11"
+msgid "2.0.12"
+msgstr "2.0.12"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index f6f88f8..dd4f310 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 2.0.11\n"
-"POT-Creation-Date: 2010-10-28 09:20+0300\n"
+"Project-Id-Version: live-boot 2.0.12\n"
+"POT-Creation-Date: 2010-11-22 23:27+0100\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-28"
-msgstr "28.10.2010"
+msgid "2010-11-22"
+msgstr "22.11.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.11"
-msgstr "2.0.11"
+msgid "2.0.12"
+msgstr "2.0.12"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 93b021a..de12608 100644
--- 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: 2010-10-28 09:20+0300\n"
+"POT-Creation-Date: 2010-11-22 23:27+0100\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-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-28"
+msgid "2010-11-22"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.11"
+msgid "2.0.12"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index 81de50b..1c0c1d8 100644
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:20+0300\n"
+"POT-Creation-Date: 2010-11-22 23:27+0100\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-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-28"
+msgid "2010-11-22"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.11"
+msgid "2.0.12"
msgstr ""
#. type: TH
diff --git a/scripts/live b/scripts/live
index 4b1b92d..d79beed 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1485,7 +1485,7 @@ check_dev ()
echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live.log
else
mkdir /isofrom
- mount "$ISO_DEVICE" /isofrom
+ mount -t auto "$ISO_DEVICE" /isofrom
ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
devname="${loopdevname}"
--
live-boot
More information about the debian-live-changes
mailing list