[SCM] live-boot branch, upstream, updated. upstream/2.0.13-1-gfb8b930

Daniel Baumann daniel at debian.org
Fri Dec 24 17:54:50 UTC 2010 

The following commit has been merged in the upstream branch:
commit fb8b93068d2783844214bfa95feaffcc6df498cf
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Dec 24 18:54:17 2010 +0100

    Adding upstream version 2.0.14.

diff --git a/VERSION b/VERSION
index 82bd22f..3d45b5c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.13
+2.0.14
diff --git a/hooks/live b/hooks/live
index b5d43f2..cebe9c9 100755
--- a/hooks/live
+++ b/hooks/live
@@ -175,7 +175,8 @@ copy_exec /usr/bin/md5sum /bin
 if [ -x /usr/bin/memdiskfind ]
 then
 	copy_exec /usr/bin/memdiskfind
-	manual_add_modules phram mtdblock
+	manual_add_modules phram
+	manual_add_modules mtdblock
 fi
 
 # Program: cpio
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 4142874..5a8fb86 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 06.12.2010 2.0.13 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 24.12.2010 2.0.14 "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 8fec493..1ee86a1 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 06.12.2010 2.0.13 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 24.12.2010 2.0.14 "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 05c0cf9..8695458 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-12\-06 2.0.13 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-12\-24 2.0.14 "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 55d68b0..dc06059 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-12\-06 2.0.13 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-12\-24 2.0.14 "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 cfecfa4..6c6b0f2 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.13\n"
-"POT-Creation-Date: 2010-12-06 11:18+0100\n"
+"Project-Id-Version: live-boot 2.0.14\n"
+"POT-Creation-Date: 2010-12-24 18:52+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-12-06"
-msgstr "06.12.2010"
+msgid "2010-12-24"
+msgstr "24.12.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0.13"
-msgstr "2.0.13"
+msgid "2.0.14"
+msgstr "2.0.14"
 
 #. 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 857cd76..0dbc735 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.13\n"
-"POT-Creation-Date: 2010-12-06 11:18+0100\n"
+"Project-Id-Version: live-boot 2.0.14\n"
+"POT-Creation-Date: 2010-12-24 18:52+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-12-06"
-msgstr "06.12.2010"
+msgid "2010-12-24"
+msgstr "24.12.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0.13"
-msgstr "2.0.13"
+msgid "2.0.14"
+msgstr "2.0.14"
 
 #. 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 1cd564f..20e06af 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-12-06 11:18+0100\n"
+"POT-Creation-Date: 2010-12-24 18:52+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-12-06"
+msgid "2010-12-24"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0.13"
+msgid "2.0.14"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index 0d20c6d..cab7623 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-12-06 11:18+0100\n"
+"POT-Creation-Date: 2010-12-24 18:52+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-12-06"
+msgid "2010-12-24"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0.13"
+msgid "2.0.14"
 msgstr ""
 
 #. type: TH
diff --git a/scripts/live b/scripts/live
index d79beed..f87919d 100755
--- a/scripts/live
+++ b/scripts/live
@@ -471,6 +471,9 @@ is_nice_device ()
 	elif echo ${sysfs_path} | grep -q "^/block/dm-"
 	then
 		return 0
+	elif echo ${sysfs_path} | grep -q "^/block/mtdblock"
+	then
+		return 0
 	fi
 
 	return 1

-- 
live-boot

More information about the debian-live-changes mailing list