[SCM] live-boot branch, upstream, updated. upstream/3.0_a24-1-gc44e830
Daniel Baumann
daniel at debian.org
Mon Feb 6 22:29:50 UTC 2012
The following commit has been merged in the upstream branch:
commit c44e830d8c1ef4e8aa2db197c098a32333fecff0
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Feb 6 23:29:02 2012 +0100
Adding upstream version 3.0~a25.
diff --git a/VERSION b/VERSION
index 7d277db..c693afd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a24-1
+3.0~a25-1
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 9cd2415..21f6680 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 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
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index b934552..cdaad14 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 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
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index ad5261e..ad6d1d2 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -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
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 02c0545..a7daa55 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -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
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index c424b22..c1e8a99 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -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 at 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
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 2beba0a..2041de2 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -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 at 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
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 6a56e23..7f46b3a 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: 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 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 "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
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index cf06a4c..ab3ee0f 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: 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 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 "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
diff --git a/scripts/live b/scripts/live
index 8ffbc20..5af7ad8 100755
--- a/scripts/live
+++ b/scripts/live
@@ -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}" ]
--
live-boot
More information about the debian-live-changes
mailing list