summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION2
-rw-r--r--debian/changelog29
-rw-r--r--manpages/de/live-boot.de.72
-rw-r--r--manpages/de/persistence.conf.de.52
-rw-r--r--manpages/en/live-boot.72
-rw-r--r--manpages/en/persistence.conf.52
-rw-r--r--manpages/es/live-boot.es.72
-rw-r--r--manpages/es/persistence.conf.es.52
-rw-r--r--manpages/po/de/live-boot.7.po12
-rw-r--r--manpages/po/de/persistence.conf.5.po12
-rw-r--r--manpages/po/es/live-boot.7.po12
-rw-r--r--manpages/po/es/persistence.conf.5.po12
-rw-r--r--manpages/pot/live-boot.7.pot6
-rw-r--r--manpages/pot/persistence.conf.5.pot6
14 files changed, 66 insertions, 37 deletions
diff --git a/VERSION b/VERSION
index c5a2bb6..f7d9b10 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a10-1
+4.0~a11-1
diff --git a/debian/changelog b/debian/changelog
index 699ef8e..20ff157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+live-boot (4.0~a11-1) experimental; urgency=low
+
+ [ chals ]
+ * Updating dates in man pages.
+ * Updating the Spanish translation of live-boot man page.
+ * Updating the Spanish translation of persistence.conf man page.
+ * Fixing the use of one preposition in the Spanish translation of the
+ man pages.
+
+ [ Daniel Baumann ]
+ * Renumbering the first three early scripts.
+ * Renaming main function to live for consistent namespace.
+ * Correcting leftovers from old variable handling for BOOTIF, thanks to
+ Andrew Jeffery <andrewj@avalon.com.au> (Closes: #703743).
+
+ [ Andrew Jeffery ]
+ * Select BOOTIF device if defined for netboot (Closes: #703744).
+ * Don't quote $CIFSOPTS for mount.cifs (Closes: #703746).
+
+ [ Peter Schaefer ]
+ * Adding support for luks persistence with persistence files (Closes:
+ #701614).
+
+ [ David Hare ]
+ * Also blacklisting findiso and fromiso devices for luks file
+ persistence.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Mon, 06 May 2013 14:28:00 +0200
+
live-boot (4.0~a10-1) experimental; urgency=low
[ Daniel Baumann ]
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index e701ae7..9508d9b 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 13.04.2013 4.0~a10\-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 06.05.2013 4.0~a11\-1 "Live Systems Project"
.SH NAME
\fBlive\-boot\fP \- System Boot Scripts
diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
index 2d8139a..c134248 100644
--- a/manpages/de/persistence.conf.de.5
+++ b/manpages/de/persistence.conf.de.5
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 13.04.2013 4.0~a10\-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 06.05.2013 4.0~a11\-1 "Live Systems Project"
.SH NAME
\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 734344d..c323cf4 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2013\-04\-13 4.0~a10-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2013\-05\-06 4.0~a11-1 "Live Systems Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index 8fb925b..698b079 100644
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2013\-04\-13 4.0~a10-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2013\-05\-06 4.0~a11-1 "Live Systems Project"
.SH NAME
\fBpersistence.conf\fR \- Configuration file for persistence media in
diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
index acc9faf..48ff6f2 100644
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 13.04.2013 4.0~a10\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 06.05.2013 4.0~a11\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-boot\fP \- Scripts de Arranque del Sistema
diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index 8c4da71..92ef054 100644
--- a/manpages/es/persistence.conf.es.5
+++ b/manpages/es/persistence.conf.es.5
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 13.04.2013 4.0~a10\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 06.05.2013 4.0~a11\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 1bc9d0c..00faf05 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 4.0~a10-1\n"
-"POT-Creation-Date: 2013-04-13 16:46+0300\n"
+"Project-Id-Version: live-boot 4.0~a11-1\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\n"
"PO-Revision-Date: 2013-04-13 16:48+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-04-13"
-msgstr "13.04.2013"
+msgid "2013-05-06"
+msgstr "06.05.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a10-1"
-msgstr "4.0~a10-1"
+msgid "4.0~a11-1"
+msgstr "4.0~a11-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
index e751b5e..63b0b03 100644
--- a/manpages/po/de/persistence.conf.5.po
+++ b/manpages/po/de/persistence.conf.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~a10-1\n"
-"POT-Creation-Date: 2013-04-13 16:46+0300\n"
+"Project-Id-Version: live-boot 4.0~a11-1\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\n"
"PO-Revision-Date: 2013-04-13 16:48+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-04-13"
-msgstr "13.04.2013"
+msgid "2013-05-06"
+msgstr "06.05.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a10-1"
-msgstr "4.0~a10-1"
+msgid "4.0~a11-1"
+msgstr "4.0~a11-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index 972ba3e..c05cd2f 100644
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~a10-1\n"
-"POT-Creation-Date: 2013-04-13 16:46+0300\n"
+"Project-Id-Version: live-boot 4.0~a11-1\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\n"
"PO-Revision-Date: 2013-04-13 22:38+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-04-13"
-msgstr "13.04.2013"
+msgid "2013-05-06"
+msgstr "06.05.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a10-1"
-msgstr "4.0~a10-1"
+msgid "4.0~a11-1"
+msgstr "4.0~a11-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index ebd3206..b349e5d 100644
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~a10-1\n"
-"POT-Creation-Date: 2013-04-13 16:46+0300\n"
+"Project-Id-Version: live-boot 4.0~a11-1\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\n"
"PO-Revision-Date: 2013-04-13 16:38+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-04-13"
-msgstr "13.04.2013"
+msgid "2013-05-06"
+msgstr "06.05.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a10-1"
-msgstr "4.0~a10-1"
+msgid "4.0~a11-1"
+msgstr "4.0~a11-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 9ea07e5..120aeea 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: 2013-04-13 16:46+0300\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\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/persistence.conf.5:1
#, no-wrap
-msgid "2013-04-13"
+msgid "2013-05-06"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a10-1"
+msgid "4.0~a11-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index b7c788a..517d088 100644
--- a/manpages/pot/persistence.conf.5.pot
+++ b/manpages/pot/persistence.conf.5.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2013-04-13 16:46+0300\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\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/persistence.conf.5:1
#, no-wrap
-msgid "2013-04-13"
+msgid "2013-05-06"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a10-1"
+msgid "4.0~a11-1"
msgstr ""
#. type: TH