Adding upstream version 3.0~a25. upstream/3.0_a25
authorDaniel Baumann <daniel@debian.org>
Mon, 6 Feb 2012 22:29:02 +0000 (23:29 +0100)
committerDaniel Baumann <daniel@debian.org>
Mon, 6 Feb 2012 22:29:02 +0000 (23:29 +0100)
VERSION
manpages/de/live-boot.de.7
manpages/de/live-snapshot.de.1
manpages/en/live-boot.7
manpages/en/live-snapshot.1
manpages/po/de/live-boot.7.po
manpages/po/de/live-snapshot.1.po
manpages/pot/live-boot.7.pot
manpages/pot/live-snapshot.1.pot
scripts/live

diff --git a/VERSION b/VERSION
index 7d277db..c693afd 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a24-1
+3.0~a25-1
index 9cd2415..21f6680 100644 (file)
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 04.12.2011 3.0~a24\-1 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 2012\-02\-06 3.0~a25\-1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte
index b934552..cdaad14 100644 (file)
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 1 04.12.2011 3.0~a24\-1 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 2012\-02\-06 3.0~a25\-1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage
index ad5261e..ad6d1d2 100644 (file)
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2011\-12\-04 3.0~a24-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-02\-06 3.0~a25-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
index 02c0545..a7daa55 100644 (file)
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2011\-12\-04 3.0~a24-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-02\-06 3.0~a25-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage
index c424b22..c1e8a99 100644 (file)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a22-1\n"
-"POT-Creation-Date: 2011-12-04 09:58+0100\n"
+"POT-Creation-Date: 2012-02-06 23:27+0100\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -23,14 +23,16 @@ msgstr "LIVE-BOOT"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "2011-12-04"
+#, fuzzy, no-wrap
+#| msgid "2011-12-04"
+msgid "2012-02-06"
 msgstr "04.12.2011"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "3.0~a24-1"
+#, fuzzy, no-wrap
+#| msgid "3.0~a24-1"
+msgid "3.0~a25-1"
 msgstr "3.0~a24-1"
 
 #. type: TH
index 2beba0a..2041de2 100644 (file)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a22-1\n"
-"POT-Creation-Date: 2011-12-04 09:58+0100\n"
+"POT-Creation-Date: 2012-02-06 23:27+0100\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -23,14 +23,16 @@ msgstr "LIVE-BOOT"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "2011-12-04"
+#, fuzzy, no-wrap
+#| msgid "2011-12-04"
+msgid "2012-02-06"
 msgstr "04.12.2011"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "3.0~a24-1"
+#, fuzzy, no-wrap
+#| msgid "3.0~a24-1"
+msgid "3.0~a25-1"
 msgstr "3.0~a24-1"
 
 #. type: TH
index 6a56e23..7f46b3a 100644 (file)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2011-12-04 09:58+0100\n"
+"POT-Creation-Date: 2012-02-06 23:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-12-04"
+msgid "2012-02-06"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a24-1"
+msgid "3.0~a25-1"
 msgstr ""
 
 #. type: TH
index cf06a4c..ab3ee0f 100644 (file)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2011-12-04 09:58+0100\n"
+"POT-Creation-Date: 2012-02-06 23:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-12-04"
+msgid "2012-02-06"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a24-1"
+msgid "3.0~a25-1"
 msgstr ""
 
 #. type: TH
index 8ffbc20..5af7ad8 100755 (executable)
@@ -1208,7 +1208,7 @@ setup_unionfs ()
        addimage_directory="${3}"
 
        case ${UNIONTYPE} in
-               aufs|unionfs)
+               aufs|unionfs|overlayfs)
                        modprobe -q -b ${UNIONTYPE}
 
                        if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ]
@@ -1570,6 +1570,10 @@ setup_unionfs ()
                                mount_full $unionmountopts "${unionmountpoint}"
                                ;;
 
+                       overlayfs)
+                               unionmountopts="-o noatime,${noxino_opt},lowerdir=${unionro},upperdir=${unionrw}"
+                               mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
+                               ;;
 
                        *)
                                if [ -n "${PERSISTENT_READONLY}" ]