From 42f9e72e523ae3ded9a676d0fe53c769b7a491db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 10 Jun 2010 12:43:55 +0200 Subject: [PATCH] Adding upstream version 2.0~a8. --- Makefile | 4 --- VERSION | 2 +- conf/compcache | 1 - docs/parameters.txt | 20 --------------- 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/22serialtty | 52 --------------------------------------- 13 files changed, 23 insertions(+), 100 deletions(-) delete mode 100644 conf/compcache delete mode 100755 scripts/live-bottom/22serialtty diff --git a/Makefile b/Makefile index efdb0e3..85b4b84 100644 --- a/Makefile +++ b/Makefile @@ -39,10 +39,6 @@ build: @echo "Nothing to build." install: - # (FIXME) - # Installing configuration - install -D -m 0644 conf/compcache $(DESTDIR)/usr/share/initramfs-tools/conf.d/compcache - # Installing executables mkdir -p $(DESTDIR)/sbin cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin diff --git a/VERSION b/VERSION index 288a58c..9eaada7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0~a7 +2.0~a8 diff --git a/conf/compcache b/conf/compcache deleted file mode 100644 index 4e04878..0000000 --- a/conf/compcache +++ /dev/null @@ -1 +0,0 @@ -COMPCACHE_SIZE="50%" diff --git a/docs/parameters.txt b/docs/parameters.txt index 1887608..b1bd6b9 100644 --- a/docs/parameters.txt +++ b/docs/parameters.txt @@ -6,53 +6,33 @@ Updated for live-initramfs 1.156.1-1 on 2009-02-08. These options (can be combined) work from the bootloader prompt: live access=ACCESS -live console=TTY,SPEED live debug live fetch=URL live httpfs=URL -live hostname=HOSTNAME -live username=USER -live userfullname=USERFULLNAME live integrity-check live ip=[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF] [,[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF]]* live ip[=frommedia] live iscsi=target-ip[,target-port];target-name -live {keyb|kbd-chooser/method}=KEYBOARD -live {klayout|console-setup/layoutcode}=LAYOUT -live {kvariant|console-setup/variantcode}=VARIANT -live {kmodel|console-setup/modelcode}=CODE -live koptions=OPTIONS -live live-getty live {live-media|bootfrom}=DEVICE live {live-media-encryption|encryption}=TYPE live live-media-offset=BYTES live live-media-path=PATH live live-media-timeout=SECONDS -live {locale|debian-installer/locale}=LOCALE live module=NAME live netboot[=nfs|cifs] live nfsopts= -live noautologin -live noxautologin live nofastboot live nopersistent -live nosudo live swapon -live nouser -live noxautoconfig live persistent[=nofiles] live persistent-path=PATH live {preseed/file|file}=FILE live package/question=VALUE live quickreboot live showmounts -live timezone=TIMEZONE live todisk=DEVICE live toram live union=aufs|unionfs -live utc=yes|no -live xdebconf -live xvideomode=RESOLUTION Values for the vga kernel parameter: diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 0d8df6f..70acb76 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 08.06.2010 2.0~a7 "Debian Live Projekt" +.TH LIVE\-BOOT 7 10.06.2010 2.0~a8 "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 f4deb30..05caea7 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 08.06.2010 2.0~a7 "Debian Live Projekt" +.TH LIVE\-BOOT 1 10.06.2010 2.0~a8 "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 47c32b0..01761ce 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2010\-06\-08 2.0~a7 "Debian Live Project" +.TH LIVE\-BOOT 7 2010\-06\-10 2.0~a8 "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 81469ff..134fc83 100644 --- a/manpages/en/live-snapshot.1 +++ b/manpages/en/live-snapshot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 1 2010\-06\-08 2.0~a7 "Debian Live Project" +.TH LIVE\-BOOT 1 2010\-06\-10 2.0~a8 "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 ada2824..9e3d28f 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~a7\n" -"POT-Creation-Date: 2010-06-08 20:20+0300\n" +"Project-Id-Version: live-boot 2.0~a8\n" +"POT-Creation-Date: 2010-06-10 12:37+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-06-08" -msgstr "08.06.2010" +msgid "2010-06-10" +msgstr "10.06.2010" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a7" -msgstr "2.0~a7" +msgid "2.0~a8" +msgstr "2.0~a8" #. 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 6011ad0..05da552 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~a7\n" -"POT-Creation-Date: 2010-06-08 20:20+0300\n" +"Project-Id-Version: live-boot 2.0~a8\n" +"POT-Creation-Date: 2010-06-10 12:37+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-06-08" -msgstr "08.06.2010" +msgid "2010-06-10" +msgstr "10.06.2010" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a7" -msgstr "2.0~a7" +msgid "2.0~a8" +msgstr "2.0~a8" #. 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 da80d11..01ae396 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-06-08 20:20+0300\n" +"POT-Creation-Date: 2010-06-10 12:37+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-06-08" +msgid "2010-06-10" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a7" +msgid "2.0~a8" msgstr "" #. type: TH diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot index 9966513..d7ce9d4 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-06-08 20:20+0300\n" +"POT-Creation-Date: 2010-06-10 12:37+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-06-08" +msgid "2010-06-10" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a7" +msgid "2.0~a8" msgstr "" #. type: TH diff --git a/scripts/live-bottom/22serialtty b/scripts/live-bottom/22serialtty deleted file mode 100755 index ee9ddb1..0000000 --- a/scripts/live-bottom/22serialtty +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-boot header - -# this bottom script currently only works with upstart -if [ ! -d /root/etc/init ] -then - exit 0 -fi - -. /scripts/live-functions - -# live-boot script - -for ARGUMENT in $(cat /proc/cmdline) -do - case ${ARGUMENT} in - serialtty=*) - tty="${ARGUMENT#serialtty=}" - - log_begin_msg "Setting up a serial tty..." - -cat > /root/etc/init/${tty}.conf <