From 1e75f8e9e9704dbf9f50f4520b592c93308e3b04 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 9 Mar 2011 17:11:39 +0100 Subject: [PATCH] Adding upstream version 3.0~a12. --- VERSION | 2 +- manpages/de/live-boot.de.7 | 2 +- manpages/de/live-snapshot.de.1 | 2 +- manpages/en/live-boot.7 | 2 +- manpages/en/live-snapshot.1 | 2 +- manpages/po/de/live-boot.7.po | 12 ++++++------ manpages/po/de/live-snapshot.1.po | 12 ++++++------ manpages/pot/live-boot.7.pot | 6 +++--- manpages/pot/live-snapshot.1.pot | 6 +++--- scripts/live | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/VERSION b/VERSION index 2e25043..0ddcaf1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~a11 +3.0~a12 diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 7235742..b0e8a9a 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 3.0~a11 "Debian Live Projekt" +.TH LIVE\-BOOT 7 22.11.2010 3.0~a12 "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 5ff8a2b..f6d0041 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 3.0~a11 "Debian Live Projekt" +.TH LIVE\-BOOT 1 22.11.2010 3.0~a12 "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 e75db6b..17c0935 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2010\-10\-28 3.0~a11 "Debian Live Project" +.TH LIVE\-BOOT 7 2010\-11\-22 3.0~a12 "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 d3bd25a..74df415 100644 --- a/manpages/en/live-snapshot.1 +++ b/manpages/en/live-snapshot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 1 2010\-10\-28 3.0~a11 "Debian Live Project" +.TH LIVE\-BOOT 1 2010\-11\-22 3.0~a12 "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 16060a1..aeb90fd 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 3.0~a11\n" -"POT-Creation-Date: 2010-10-28 09:27+0300\n" +"Project-Id-Version: live-boot 3.0~a12\n" +"POT-Creation-Date: 2010-11-22 23:30+0100\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \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 "3.0~a11" -msgstr "3.0~a11" +msgid "3.0~a12" +msgstr "3.0~a12" #. 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 9ddcda6..701b07d 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 3.0~a11\n" -"POT-Creation-Date: 2010-10-28 09:27+0300\n" +"Project-Id-Version: live-boot 3.0~a12\n" +"POT-Creation-Date: 2010-11-22 23:30+0100\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \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 "3.0~a11" -msgstr "3.0~a11" +msgid "3.0~a12" +msgstr "3.0~a12" #. 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 37a303c..5445c82 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:27+0300\n" +"POT-Creation-Date: 2010-11-22 23:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \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 "3.0~a11" +msgid "3.0~a12" msgstr "" #. type: TH diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot index 572409a..2033a10 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:27+0300\n" +"POT-Creation-Date: 2010-11-22 23:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \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 "3.0~a11" +msgid "3.0~a12" msgstr "" #. type: TH diff --git a/scripts/live b/scripts/live index c5f4d50..90eca0f 100755 --- a/scripts/live +++ b/scripts/live @@ -1556,7 +1556,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}" -- 2.1.4