From 00b40ad9867f00e40d9d7ad0d89ef294f4afd4b6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 11 Jun 2011 11:25:19 +0200 Subject: [PATCH] Adding upstream version 3.0~a18. --- Makefile | 2 +- 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 | 4 ++-- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 4e579a3..138886c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL := sh -e -LANGUAGES = en $(shell cd manpages/po && ls) +LANGUAGES = $(shell cd manpages/po && ls) SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/* diff --git a/VERSION b/VERSION index 31cfe14..2b538e2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~a17 +3.0~a18 diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index b462e99..a73d1ea 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 2011\-05\-18 3.0~a17 "Debian Live Projekt" +.TH LIVE\-BOOT 7 11.06.2011 3.0~a18 "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 cfe6968..b89e20f 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 2011\-05\-18 3.0~a17 "Debian Live Projekt" +.TH LIVE\-BOOT 1 11.06.2011 3.0~a18 "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 c353617..f331372 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2011\-05\-18 3.0~a17 "Debian Live Project" +.TH LIVE\-BOOT 7 2011\-06\-11 3.0~a18 "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 2cbaa14..67cb4e1 100644 --- a/manpages/en/live-snapshot.1 +++ b/manpages/en/live-snapshot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 1 2011\-05\-18 3.0~a17 "Debian Live Project" +.TH LIVE\-BOOT 1 2011\-06\-11 3.0~a18 "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 9f6b6d7..7e9fabc 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~a17\n" -"POT-Creation-Date: 2011-05-18 19:30+0300\n" +"Project-Id-Version: live-boot 3.0~a18\n" +"POT-Creation-Date: 2011-06-11 11:22+0300\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 "2011-05-18" -msgstr "" +msgid "2011-06-11" +msgstr "11.06.2011" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a17" -msgstr "3.0~a17" +msgid "3.0~a18" +msgstr "3.0~a18" #. 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 b4fc00b..d60661b 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~a17\n" -"POT-Creation-Date: 2011-05-18 19:30+0300\n" +"Project-Id-Version: live-boot 3.0~a18\n" +"POT-Creation-Date: 2011-06-11 11:22+0300\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 "2011-05-18" -msgstr "" +msgid "2011-06-11" +msgstr "11.06.2011" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a17" -msgstr "3.0~a17" +msgid "3.0~a18" +msgstr "3.0~a18" #. 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 10ead51..79ff793 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-05-18 19:30+0300\n" +"POT-Creation-Date: 2011-06-11 11:22+0300\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 "2011-05-18" +msgid "2011-06-11" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a17" +msgid "3.0~a18" msgstr "" #. type: TH diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot index f88aa15..3a19931 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-05-18 19:30+0300\n" +"POT-Creation-Date: 2011-06-11 11:22+0300\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 "2011-05-18" +msgid "2011-06-11" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a17" +msgid "3.0~a18" msgstr "" #. type: TH diff --git a/scripts/live b/scripts/live index 57a4d32..23d0bbc 100755 --- a/scripts/live +++ b/scripts/live @@ -1476,8 +1476,8 @@ setup_unionfs () unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO" ( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384 unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \ - ( mkdir -p /run/initramfs - pidof unionfs-fuse >> /run/initramfs/sendsigs.omit || true ) + ( mkdir -p /run/sendsigs.omit.d + pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true ) ;; unionmount) -- 2.1.4