From 418d4fcfb53d5af0c2ad7f255dac7d05f24424a6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 30 May 2010 09:29:44 +0200 Subject: [PATCH] Adding upstream version 2.0~a3. --- 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-bottom/16umountfs | 38 -------------------------------------- 10 files changed, 23 insertions(+), 61 deletions(-) delete mode 100755 scripts/live-bottom/16umountfs diff --git a/VERSION b/VERSION index 0a140b3..d0651f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0~a2 +2.0~a3 diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 50a8cd3..0f7cb6f 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 27.05.2010 2.0~a2 "Debian Live Projekt" +.TH LIVE\-BOOT 7 30.05.2010 2.0~a3 "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 46b3b4e..3b484dc 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 27.05.2010 2.0~a2 "Debian Live Projekt" +.TH LIVE\-BOOT 1 30.05.2010 2.0~a3 "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 2b940e3..cd4f7b7 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2010\-05\-27 2.0~a2 "Debian Live Project" +.TH LIVE\-BOOT 7 2010\-05\-30 2.0~a3 "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 a08e92f..40072a1 100644 --- a/manpages/en/live-snapshot.1 +++ b/manpages/en/live-snapshot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 1 2010\-05\-27 2.0~a2 "Debian Live Project" +.TH LIVE\-BOOT 1 2010\-05\-30 2.0~a3 "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 8b3a693..2f0cd12 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~a1\n" -"POT-Creation-Date: 2010-05-24 12:46+0300\n" +"Project-Id-Version: live-boot 2.0~a3\n" +"POT-Creation-Date: 2010-05-30 09:26+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 "2010-05-27" -msgstr "27.05.2010" +msgid "2010-05-30" +msgstr "30.05.2010" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a2" -msgstr "2.0~a2" +msgid "2.0~a3" +msgstr "2.0~a3" #. 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 55ba56f..c17ebe7 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~a1\n" -"POT-Creation-Date: 2010-05-24 12:46+0300\n" +"Project-Id-Version: live-boot 2.0~a3\n" +"POT-Creation-Date: 2010-05-30 09:26+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 "2010-05-27" -msgstr "27.05.2010" +msgid "2010-05-30" +msgstr "30.05.2010" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a2" -msgstr "2.0~a2" +msgid "2.0~a3" +msgstr "2.0~a3" #. 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 7e7a557..13a8ec4 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-05-27 22:42+0300\n" +"POT-Creation-Date: 2010-05-30 09:26+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,13 +24,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2010-05-27" +msgid "2010-05-30" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a2" +msgid "2.0~a3" msgstr "" #. type: TH diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot index a088e4b..e24f851 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-05-27 22:42+0300\n" +"POT-Creation-Date: 2010-05-30 09:26+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,13 +24,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2010-05-27" +msgid "2010-05-30" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a2" +msgid "2.0~a3" msgstr "" #. type: TH diff --git a/scripts/live-bottom/16umountfs b/scripts/live-bottom/16umountfs deleted file mode 100755 index 055c3f6..0000000 --- a/scripts/live-bottom/16umountfs +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-boot header - -. /live.vars - -. /scripts/live-functions - -log_begin_msg "Disabling umountfs for live specific filesystems" - -# live-boot script - -if [ -e /root/etc/init.d/umountfs ] -then - sed -i -e 's#pioodl $TMPFS_MTPTS)#pioodl $TMPFS_MTPTS | sed -e "s@\\ @\\n@" | grep -v ^/live)#' \ - -e 's#pioodl $REG_MTPTS)#pioodl $REG_MTPTS | sed -e "s@\\ @\\n@" | grep -v ^/live | grep -v ^/filesystem) /#' \ - /root/etc/init.d/umountfs -fi - -log_end_msg -- 2.1.4