Adding upstream version 2.0~a6.

diff --git a/Makefile b/Makefile
index 85b8909..efdb0e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ install:
 
        # Installing executables
        mkdir -p $(DESTDIR)/sbin
-       cp bin/live-getty bin/live-login bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
+       cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
 
        mkdir -p $(DESTDIR)/usr/share/live-boot
        cp bin/live-preseed bin/live-reconfigure contrib/languagelist $(DESTDIR)/usr/share/live-boot
@@ -79,7 +79,7 @@ install:
 
 uninstall:
        # Uninstalling executables
-       rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
+       rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
        rm -rf $(DESTDIR)/usr/share/live-boot
        rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
        rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*

diff --git a/VERSION b/VERSION
index d670b1b..a1d37aa 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a5
+2.0~a6

diff --git a/bin/live-getty b/bin/live-getty
deleted file mode 100755 (executable)
index 6781ea5..0000000
--- a/bin/live-getty
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-AUTOLOGIN="1"
-
-for ARGUMENT in "${@}"
-do
-       if [ "${ARGUMENT}" = "-l" ] || [ "${ARGUMENT}" = "-n" ]
-       then
-               AUTOLOGIN="0"
-       fi
-done
-
-if [ "${AUTOLOGIN}" = "1" ]
-then
-       exec /sbin/getty -n -l /sbin/live-login ${*}
-else
-       exec /sbin/getty ${*}
-fi

diff --git a/bin/live-login b/bin/live-login
deleted file mode 100755 (executable)
index c2cc5a1..0000000
--- a/bin/live-login
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-USERNAME="root"
-
-if [ -f /etc/live.conf ]
-then
-       . /etc/live.conf
-fi
-
-exec /bin/login -f "${USERNAME}"

diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index 4b7fd1d..41c0ae1 100755 (executable)
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
+PROGRAM="LIVE\\\-BOOT"
 VERSION="$(cat ../VERSION)"
 
 echo "Updating version headers..."
@@ -10,5 +12,5 @@ for MANPAGE in en/*
 do
        SECTION="$(basename ${MANPAGE} | awk -F. '{ print $2 }')"
 
-       sed -i -e "s|^.TH.*$|.TH LIVE\\\-BOOT ${SECTION} $(date +%Y\\\\-%m\\\\-%d) ${VERSION} \"Debian Live Project\"|" ${MANPAGE}
+       sed -i -e "s|^.TH.*$|.TH ${PROGRAM} ${SECTION} ${DATE} ${VERSION} \"Debian Live Project\"|" ${MANPAGE}
 done

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 1802607..8f3abfc 100644 (file)
--- 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 2010\-06\-05 2.0~a5 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 2010\-06\-08 2.0~a6 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte
@@ -98,16 +98,6 @@ boot param specification
 If this variable is set, dhcp and static configuration are just skipped and
 the system will use the (must be) media\-preconfigured
 /etc/network/interfaces instead.
-.IP "{\fBkeyb\fP|\fBkbd\-chooser/method\fP}=\fIKEYBOARD\fP, {\fBklayout\fP|\fBconsole\-setup/layoutcode\fP}=\fILAYOUT\fP, {\fBkvariant\fP|\fBconsole\-setup/variantcode\fP}=\fIVARIANT\fP, {\fBkmodel\fP\fI|\fP\fBconsole\-setup/modelcode\fP}=\fICODE\fP, \fBkoptions\fP=\fIOPTIONS\fP" 4
-Configure the running keyboard as specified, if this one misses live\-boot
-behaves as if "keyb=us" was specified. It will be interfered from "locale="
-if locale is only 2 lowecase letters as a special case. You could also
-specify console layout, variant, code, and options (no defaults).
-.IP \fBlive\-getty\fP 4
-This changes the auto\-login on virtual terminals to use the (experimental)
-live\-getty code. With this option set the standard kernel argument
-"console=" is parsed and if a serial console is specified then live\-getty is
-used to autologin on the serial console.
 .IP {\fBlive\-media\fP|\fBbootfrom\fP}=\fIDEVICE\fP 4
 If you specify one of this two equivalent forms, live\-boot will first try to
 find this device for the "/live" directory where the read\-only root

diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index d7104c5..c4a1e90 100644 (file)
--- 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 2010\-06\-05 2.0~a5 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 2010\-06\-08 2.0~a6 "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 4068a6f..0a8ccb3 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-06\-05 2.0~a5 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-06\-08 2.0~a6 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -63,10 +63,6 @@ If specified, an MD5 sum is calculated on the live media during boot and compare
 Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify this if you want to use dhcp (default). It will be changed in a future release to mimick official kernel boot param specification (e.g. ip=10.0.0.1::10.0.0.254:255.255.255.0::eth0,:::::eth1:dhcp).
 .IP "\fBip\fR=[\fIfrommedia\fR]" 4
 If this variable is set, dhcp and static configuration are just skipped and the system will use the (must be) media\-preconfigured /etc/network/interfaces instead.
-.IP "{\fBkeyb\fR|\fBkbd\-chooser/method\fR}=\fIKEYBOARD\fR, {\fBklayout\fR|\fBconsole\-setup/layoutcode\fR}=\fILAYOUT\fR, {\fBkvariant\fR|\fBconsole\-setup/variantcode\fR}=\fIVARIANT\fR, {\fBkmodel\fI|\fBconsole\-setup/modelcode\fR}=\fICODE\fR, \fBkoptions\fR=\fIOPTIONS\fR" 4
-Configure the running keyboard as specified, if this one misses live\-boot behaves as if "keyb=us" was specified. It will be interfered from "locale=" if locale is only 2 lowecase letters as a special case. You could also specify console layout, variant, code, and options (no defaults).
-.IP "\fBlive\-getty\fR" 4
-This changes the auto\-login on virtual terminals to use the (experimental) live\-getty code. With this option set the standard kernel argument "console=" is parsed and if a serial console is specified then live\-getty is used to autologin on the serial console.
 .IP "{\fBlive\-media\fR|\fBbootfrom\fR}=\fIDEVICE\fR" 4
 If you specify one of this two equivalent forms, live\-boot will first try to find this device for the "/live" directory where the read\-only root filesystem should reside. If it did not find something usable, the normal scan for block devices is performed.
 .br

diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 3ac5585..a9ef5d8 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-06\-05 2.0~a5 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-06\-08 2.0~a6 "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 4a6ef79..90e2ab1 100644 (file)
--- 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~a5\n"
-"POT-Creation-Date: 2010-06-05 14:11+0300\n"
+"Project-Id-Version: live-boot 2.0~a6\n"
+"POT-Creation-Date: 2010-06-08 06:01+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -23,13 +23,13 @@ msgstr "LIVE-BOOT"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-msgid "2010-06-05"
-msgstr "05.06.2010"
+msgid "2010-06-08"
+msgstr "08.06.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-msgid "2.0~a5"
-msgstr "2.0~a5"
+msgid "2.0~a6"
+msgstr "2.0~a6"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
@@ -202,6 +202,7 @@ msgstr "B<fetch>=I<URL>"
 
 #. type: IP
 #: en/live-boot.7:40
+#, no-wrap
 msgid "B<httpfs>=I<URL>"
 msgstr "B<httpfs>=I<URL>"
 
@@ -308,41 +309,11 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:66
 #, no-wrap
-msgid "{B<keyb>|B<kbd-chooser/method>}=I<KEYBOARD>, {B<klayout>|B<console-setup/layoutcode>}=I<LAYOUT>, {B<kvariant>|B<console-setup/variantcode>}=I<VARIANT>, {B<kmodel>I<|>B<console-setup/modelcode>}=I<CODE>, B<koptions>=I<OPTIONS>"
-msgstr "{B<keyb>|B<kbd-chooser/method>}=I<KEYBOARD>, {B<klayout>|B<console-setup/layoutcode>}=I<LAYOUT>, {B<kvariant>|B<console-setup/variantcode>}=I<VARIANT>, {B<kmodel>I<|>B<console-setup/modelcode>}=I<CODE>, B<koptions>=I<OPTIONS>"
-
-#. type: Plain text
-#: en/live-boot.7:68
-msgid ""
-"Configure the running keyboard as specified, if this one misses live-boot "
-"behaves as if \"keyb=us\" was specified. It will be interfered from \"locale="
-"\" if locale is only 2 lowecase letters as a special case. You could also "
-"specify console layout, variant, code, and options (no defaults)."
-msgstr ""
-
-#. type: IP
-#: en/live-boot.7:68
-#, no-wrap
-msgid "B<live-getty>"
-msgstr "B<live-getty>"
-
-#. type: Plain text
-#: en/live-boot.7:70
-msgid ""
-"This changes the auto-login on virtual terminals to use the (experimental) "
-"live-getty code. With this option set the standard kernel argument \"console="
-"\" is parsed and if a serial console is specified then live-getty is used to "
-"autologin on the serial console."
-msgstr ""
-
-#. type: IP
-#: en/live-boot.7:70
-#, no-wrap
 msgid "{B<live-media>|B<bootfrom>}=I<DEVICE>"
 msgstr "{B<live-media>|B<bootfrom>}=I<DEVICE>"
 
 #. type: Plain text
-#: en/live-boot.7:72
+#: en/live-boot.7:68
 msgid ""
 "If you specify one of this two equivalent forms, live-boot will first try to "
 "find this device for the \"/live\" directory where the read-only root "
@@ -351,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:74
+#: en/live-boot.7:70
 msgid ""
 "Instead of specifing an actual device name, the keyword 'removable' can be "
 "used to limit the search of acceptable live media to removable type only. "
@@ -360,13 +331,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:74
+#: en/live-boot.7:70
 #, no-wrap
 msgid "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
 msgstr "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
 
 #. type: Plain text
-#: en/live-boot.7:76
+#: en/live-boot.7:72
 msgid ""
 "live-boot will mount the encrypted rootfs TYPE, asking the passphrase, "
 "useful to build paranoid live systems :-). TYPE supported so far are \"aes\" "
@@ -374,13 +345,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:76
+#: en/live-boot.7:72
 #, no-wrap
 msgid "B<live-media-offset>=I<BYTES>"
 msgstr "B<live-media-offset>=I<BYTES>"
 
 #. type: Plain text
-#: en/live-boot.7:78
+#: en/live-boot.7:74
 msgid ""
 "This way you could tell live-boot that your image starts at offset BYTES in "
 "the above specified or autodiscovered device, this could be useful to hide "
@@ -389,13 +360,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:78
+#: en/live-boot.7:74
 #, no-wrap
 msgid "B<live-media-path>=I<PATH>"
 msgstr "B<live-media-path>=I<PATH>"
 
 #. type: Plain text
-#: en/live-boot.7:80
+#: en/live-boot.7:76
 msgid ""
 "Sets the path to the live filesystem on the medium. By default, it is set to "
 "'/live' and you should not change that unless you have customized your media "
@@ -403,26 +374,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:80
+#: en/live-boot.7:76
 #, no-wrap
 msgid "B<live-media-timeout>=I<SECONDS>"
 msgstr "B<live-media-timeout>=I<SECONDS>"
 
 #. type: Plain text
-#: en/live-boot.7:82
+#: en/live-boot.7:78
 msgid ""
 "Set the timeout in seconds for the device specified by \"live-media=\" to "
 "become ready before giving up."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:82
+#: en/live-boot.7:78
 #, no-wrap
 msgid "B<module>=I<NAME>"
 msgstr "B<module>=I<NAME>"
 
 #. type: Plain text
-#: en/live-boot.7:84
+#: en/live-boot.7:80
 msgid ""
 "Instead of using the default optional file \"filesystem.module\" (see below) "
 "another file could be specified without the extension \".module\"; it should "
@@ -430,13 +401,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:84
+#: en/live-boot.7:80
 #, no-wrap
 msgid "B<netboot>[=nfs|cifs]"
 msgstr "B<netboot>[=nfs|cifs]"
 
 #. type: Plain text
-#: en/live-boot.7:86
+#: en/live-boot.7:82
 msgid ""
 "This tells live-boot to perform a network mount. The parameter \"nfsroot="
 "\" (with optional \"nfsopts=\"), should specify where is the location of the "
@@ -444,24 +415,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:86
+#: en/live-boot.7:82
 #, no-wrap
 msgid "B<nfsopts>="
 msgstr "B<nfsopts>="
 
 #. type: Plain text
-#: en/live-boot.7:88
+#: en/live-boot.7:84
 msgid "This lets you specify custom nfs options."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:88
+#: en/live-boot.7:84
 #, no-wrap
 msgid "B<nofastboot>"
 msgstr "B<nofastboot>"
 
 #. type: Plain text
-#: en/live-boot.7:90
+#: en/live-boot.7:86
 msgid ""
 "This parameter disables the default disabling of filesystem checks in /etc/"
 "fstab. If you have static filesystems on your harddisk and you want them to "
@@ -469,48 +440,48 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:90
+#: en/live-boot.7:86
 #, no-wrap
 msgid "B<nopersistent>"
 msgstr "B<nopersistent>"
 
 #. type: Plain text
-#: en/live-boot.7:92
+#: en/live-boot.7:88
 msgid ""
 "disables the \"persistent\" feature, useful if the bootloader (like "
 "syslinux) has been installed with persistent enabled."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:92
+#: en/live-boot.7:88
 #, no-wrap
 msgid "B<noprompt>"
 msgstr "B<noprompt>"
 
 #. type: Plain text
-#: en/live-boot.7:94
+#: en/live-boot.7:90
 msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:94
+#: en/live-boot.7:90
 #, no-wrap
 msgid "B<swapon>"
 msgstr "B<swapon>"
 
 #. type: Plain text
-#: en/live-boot.7:96
+#: en/live-boot.7:92
 msgid "This parameter enables usage of local swap partitions."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:96
+#: en/live-boot.7:92
 #, no-wrap
 msgid "B<noxautoconfig>"
 msgstr "B<noxautoconfig>"
 
 #. type: Plain text
-#: en/live-boot.7:98
+#: en/live-boot.7:94
 msgid ""
 "This parameter disables Xorg auto-reconfiguration at boot time. This is "
 "valuable if you either do the detection on your own, or, if you want to ship "
@@ -518,13 +489,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:98
+#: en/live-boot.7:94
 #, no-wrap
 msgid "B<persistent>[=nofiles]"
 msgstr "B<persistent>[=nofiles]"
 
 #. type: Plain text
-#: en/live-boot.7:100
+#: en/live-boot.7:96
 msgid ""
 "live-boot will look for persistent and snapshot partitions or files labeled "
 "\"live-rw\", \"home-rw\", and files called \"live-sn*\", \"home-sn*\" and "
@@ -538,13 +509,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:100
+#: en/live-boot.7:96
 #, no-wrap
 msgid "B<persistent-path>=I<PATH>"
 msgstr "B<persistent-path>=I<PATH>"
 
 #. type: Plain text
-#: en/live-boot.7:102
+#: en/live-boot.7:98
 msgid ""
 "live-boot will look for persistency files in the root directory of a "
 "partition, with this parameter, the path can be configured so that you can "
@@ -552,26 +523,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:102
+#: en/live-boot.7:98
 #, no-wrap
 msgid "{B<preseed/file>|B<file>}=I<FILE>"
 msgstr "{B<preseed/file>|B<file>}=I<FILE>"
 
 #. type: Plain text
-#: en/live-boot.7:104
+#: en/live-boot.7:100
 msgid ""
 "A path to a file present on the rootfs could be used to preseed debconf "
 "database."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:104
+#: en/live-boot.7:100
 #, no-wrap
 msgid "B<package/question>=I<VALUE>"
 msgstr "B<package/question>=I<VALUE>"
 
 #. type: Plain text
-#: en/live-boot.7:106
+#: en/live-boot.7:102
 msgid ""
 "All debian installed packages could be preseeded from command-line that way, "
 "beware of blanks spaces, they will interfere with parsing, use a preseed "
@@ -579,26 +550,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:106
+#: en/live-boot.7:102
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr "B<quickreboot>"
 
 #. type: Plain text
-#: en/live-boot.7:108
+#: en/live-boot.7:104
 msgid ""
 "This option causes live-boot to reboot without attempting to eject the media "
 "and without asking the user to remove the boot media."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:108
+#: en/live-boot.7:104
 #, no-wrap
 msgid "B<showmounts>"
 msgstr "B<showmounts>"
 
 #. type: Plain text
-#: en/live-boot.7:110
+#: en/live-boot.7:106
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -607,38 +578,38 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:110
+#: en/live-boot.7:106
 #, no-wrap
 msgid "B<silent>"
 msgstr "B<silent>"
 
 #. type: Plain text
-#: en/live-boot.7:112
+#: en/live-boot.7:108
 msgid ""
 "If you boot with the normal quiet parameter, live-boot hides most messages "
 "of its own. When adding silent, it hides all."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:112
+#: en/live-boot.7:108
 #, no-wrap
 msgid "B<textonly>"
 msgstr "B<textonly>"
 
 #. type: Plain text
-#: en/live-boot.7:114
+#: en/live-boot.7:110
 msgid ""
 "Start up to text-mode shell prompts, disabling the graphical user interface."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:114
+#: en/live-boot.7:110
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr "B<todisk>=I<DEVICE>"
 
 #. type: Plain text
-#: en/live-boot.7:116
+#: en/live-boot.7:112
 msgid ""
 "Adding this parameter, live-boot will try to copy the entire read-only media "
 "to the specified device before mounting the root filesystem. It probably "
@@ -648,13 +619,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:116
+#: en/live-boot.7:112
 #, no-wrap
 msgid "B<toram>"
 msgstr "B<toram>"
 
 #. type: Plain text
-#: en/live-boot.7:118
+#: en/live-boot.7:114
 msgid ""
 "Adding this parameter, live-boot will try to copy the whole read-only media "
 "to the computer's RAM before mounting the root filesystem. This could need a "
@@ -662,71 +633,71 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:118
+#: en/live-boot.7:114
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr "B<union>=aufs|unionfs"
 
 #. type: Plain text
-#: en/live-boot.7:120
+#: en/live-boot.7:116
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:120
+#: en/live-boot.7:116
 #, no-wrap
 msgid "B<xdebconf>"
 msgstr "B<xdebconf>"
 
 #. type: Plain text
-#: en/live-boot.7:122
+#: en/live-boot.7:118
 msgid ""
 "Uses xdebconfigurator, if present on the rootfs, to configure X instead of "
 "the standard procedure (experimental)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:122
+#: en/live-boot.7:118
 #, no-wrap
 msgid "B<xvideomode>=I<RESOLUTION>"
 msgstr "B<xvideomode>=I<RESOLUTION>"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:121
 msgid "Doesn't do xorg autodetection, but enforces a given resolution."
 msgstr ""
 
 #.  FIXME
 #. type: SH
-#: en/live-boot.7:127
+#: en/live-boot.7:123
 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:128 en/live-snapshot.1:43
+#: en/live-boot.7:124 en/live-snapshot.1:43
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr "B</etc/live.conf>"
 
 #. type: Plain text
-#: en/live-boot.7:130 en/live-snapshot.1:45
+#: en/live-boot.7:126 en/live-snapshot.1:45
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:130 en/live-snapshot.1:45
+#: en/live-boot.7:126 en/live-snapshot.1:45
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr "B<live/filesystem.module>"
 
 #. type: Plain text
-#: en/live-boot.7:132 en/live-snapshot.1:47
+#: en/live-boot.7:128 en/live-snapshot.1:47
 msgid ""
 "This optional file (inside the live media) contains a list of white-space or "
 "carriage-return-separated file names corresponding to disk images in the \"/"
@@ -739,13 +710,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:132 en/live-snapshot.1:47
+#: en/live-boot.7:128 en/live-snapshot.1:47
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr "B</etc/live-persistence.binds>"
 
 #. type: Plain text
-#: en/live-boot.7:134 en/live-snapshot.1:49
+#: en/live-boot.7:130 en/live-snapshot.1:49
 msgid ""
 "This optional file (which resides in the rootfs system, not in the live "
 "media) is used as a list of directories which not need be persistent: ie. "
@@ -754,7 +725,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:51
+#: en/live-boot.7:133 en/live-snapshot.1:51
 msgid ""
 "This saves expensive writes and speeds up operations on volatile data such "
 "as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -763,64 +734,64 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:138 en/live-snapshot.1:42
+#: en/live-boot.7:134 en/live-snapshot.1:42
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: IP
-#: en/live-boot.7:139
+#: en/live-boot.7:135
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr "B</etc/live/boot.conf>"
 
 #. type: IP
-#: en/live-boot.7:140
+#: en/live-boot.7:136
 #, no-wrap
 msgid "B</etc/live/boot.conf.d/>"
 msgstr "B</etc/live/boot.conf.d/>"
 
 #. type: IP
-#: en/live-boot.7:141
+#: en/live-boot.7:137
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr "B<live/boot.conf>"
 
 #. type: IP
-#: en/live-boot.7:142
+#: en/live-boot.7:138
 #, no-wrap
 msgid "B<live/boot.conf.d/>"
 msgstr "B<live/boot.conf.d/>"
 
 #. type: SH
-#: en/live-boot.7:144 en/live-snapshot.1:52
+#: en/live-boot.7:140 en/live-snapshot.1:52
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: en/live-boot.7:146
+#: en/live-boot.7:142
 msgid "I<live-snapshot>(1)"
 msgstr "I<live-snapshot>(1)"
 
 #. type: Plain text
-#: en/live-boot.7:148 en/live-snapshot.1:56
+#: en/live-boot.7:144 en/live-snapshot.1:56
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:58
+#: en/live-boot.7:146 en/live-snapshot.1:58
 msgid "I<live-helper>(7)"
 msgstr "I<live-helper>(7)"
 
 #. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:59
+#: en/live-boot.7:147 en/live-snapshot.1:59
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:61
+#: en/live-boot.7:149 en/live-snapshot.1:61
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -831,13 +802,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:62
+#: en/live-boot.7:150 en/live-snapshot.1:62
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:64
+#: en/live-boot.7:152 en/live-snapshot.1:64
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -851,13 +822,13 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:65
+#: en/live-boot.7:153 en/live-snapshot.1:65
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:66
+#: en/live-boot.7:154 en/live-snapshot.1:66
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."

diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 60993fd..ba9f43b 100644 (file)
--- 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~a5\n"
-"POT-Creation-Date: 2010-06-05 14:11+0300\n"
+"Project-Id-Version: live-boot 2.0~a6\n"
+"POT-Creation-Date: 2010-06-08 06:01+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -23,13 +23,13 @@ msgstr "LIVE-BOOT"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-msgid "2010-06-05"
-msgstr "05.06.2010"
+msgid "2010-06-08"
+msgstr "08.06.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-msgid "2.0~a5"
-msgstr "2.0~a5"
+msgid "2.0~a6"
+msgstr "2.0~a6"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
@@ -56,26 +56,26 @@ msgid "OPTIONS"
 msgstr "OPTIONEN"
 
 #. type: IP
-#: en/live-boot.7:128 en/live-snapshot.1:43
+#: en/live-boot.7:124 en/live-snapshot.1:43
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr "B</etc/live.conf>"
 
 #. type: Plain text
-#: en/live-boot.7:130 en/live-snapshot.1:45
+#: en/live-boot.7:126 en/live-snapshot.1:45
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:130 en/live-snapshot.1:45
+#: en/live-boot.7:126 en/live-snapshot.1:45
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr "B<live/filesystem.module>"
 
 #. type: Plain text
-#: en/live-boot.7:132 en/live-snapshot.1:47
+#: en/live-boot.7:128 en/live-snapshot.1:47
 msgid ""
 "This optional file (inside the live media) contains a list of white-space or "
 "carriage-return-separated file names corresponding to disk images in the \"/"
@@ -88,13 +88,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:132 en/live-snapshot.1:47
+#: en/live-boot.7:128 en/live-snapshot.1:47
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr "B</etc/live-persistence.binds>"
 
 #. type: Plain text
-#: en/live-boot.7:134 en/live-snapshot.1:49
+#: en/live-boot.7:130 en/live-snapshot.1:49
 msgid ""
 "This optional file (which resides in the rootfs system, not in the live "
 "media) is used as a list of directories which not need be persistent: ie. "
@@ -103,7 +103,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:51
+#: en/live-boot.7:133 en/live-snapshot.1:51
 msgid ""
 "This saves expensive writes and speeds up operations on volatile data such "
 "as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -112,35 +112,35 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:138 en/live-snapshot.1:42
+#: en/live-boot.7:134 en/live-snapshot.1:42
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: SH
-#: en/live-boot.7:144 en/live-snapshot.1:52
+#: en/live-boot.7:140 en/live-snapshot.1:52
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: en/live-boot.7:148 en/live-snapshot.1:56
+#: en/live-boot.7:144 en/live-snapshot.1:56
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:58
+#: en/live-boot.7:146 en/live-snapshot.1:58
 msgid "I<live-helper>(7)"
 msgstr "I<live-helper>(7)"
 
 #. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:59
+#: en/live-boot.7:147 en/live-snapshot.1:59
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:61
+#: en/live-boot.7:149 en/live-snapshot.1:61
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -151,13 +151,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:62
+#: en/live-boot.7:150 en/live-snapshot.1:62
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:64
+#: en/live-boot.7:152 en/live-snapshot.1:64
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -171,13 +171,13 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:65
+#: en/live-boot.7:153 en/live-snapshot.1:65
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:66
+#: en/live-boot.7:154 en/live-snapshot.1:66
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 2eb3da4..372b391 100644 (file)
--- 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-05 14:11+0300\n"
+"POT-Creation-Date: 2010-06-08 06:01+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"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-06-05"
+msgid "2010-06-08"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a5"
+msgid "2.0~a6"
 msgstr ""
 
 #. type: TH
@@ -305,41 +305,11 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:66
 #, no-wrap
-msgid "{B<keyb>|B<kbd-chooser/method>}=I<KEYBOARD>, {B<klayout>|B<console-setup/layoutcode>}=I<LAYOUT>, {B<kvariant>|B<console-setup/variantcode>}=I<VARIANT>, {B<kmodel>I<|>B<console-setup/modelcode>}=I<CODE>, B<koptions>=I<OPTIONS>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:68
-msgid ""
-"Configure the running keyboard as specified, if this one misses live-boot "
-"behaves as if \"keyb=us\" was specified. It will be interfered from \"locale="
-"\" if locale is only 2 lowecase letters as a special case. You could also "
-"specify console layout, variant, code, and options (no defaults)."
-msgstr ""
-
-#. type: IP
-#: en/live-boot.7:68
-#, no-wrap
-msgid "B<live-getty>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:70
-msgid ""
-"This changes the auto-login on virtual terminals to use the (experimental) "
-"live-getty code. With this option set the standard kernel argument \"console="
-"\" is parsed and if a serial console is specified then live-getty is used to "
-"autologin on the serial console."
-msgstr ""
-
-#. type: IP
-#: en/live-boot.7:70
-#, no-wrap
 msgid "{B<live-media>|B<bootfrom>}=I<DEVICE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:72
+#: en/live-boot.7:68
 msgid ""
 "If you specify one of this two equivalent forms, live-boot will first try to "
 "find this device for the \"/live\" directory where the read-only root "
@@ -348,7 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:74
+#: en/live-boot.7:70
 msgid ""
 "Instead of specifing an actual device name, the keyword 'removable' can be "
 "used to limit the search of acceptable live media to removable type only. "
@@ -357,13 +327,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:74
+#: en/live-boot.7:70
 #, no-wrap
 msgid "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:76
+#: en/live-boot.7:72
 msgid ""
 "live-boot will mount the encrypted rootfs TYPE, asking the passphrase, "
 "useful to build paranoid live systems :-). TYPE supported so far are \"aes\" "
@@ -371,13 +341,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:76
+#: en/live-boot.7:72
 #, no-wrap
 msgid "B<live-media-offset>=I<BYTES>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:78
+#: en/live-boot.7:74
 msgid ""
 "This way you could tell live-boot that your image starts at offset BYTES in "
 "the above specified or autodiscovered device, this could be useful to hide "
@@ -386,13 +356,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:78
+#: en/live-boot.7:74
 #, no-wrap
 msgid "B<live-media-path>=I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:80
+#: en/live-boot.7:76
 msgid ""
 "Sets the path to the live filesystem on the medium. By default, it is set to "
 "'/live' and you should not change that unless you have customized your media "
@@ -400,26 +370,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:80
+#: en/live-boot.7:76
 #, no-wrap
 msgid "B<live-media-timeout>=I<SECONDS>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:82
+#: en/live-boot.7:78
 msgid ""
 "Set the timeout in seconds for the device specified by \"live-media=\" to "
 "become ready before giving up."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:82
+#: en/live-boot.7:78
 #, no-wrap
 msgid "B<module>=I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:84
+#: en/live-boot.7:80
 msgid ""
 "Instead of using the default optional file \"filesystem.module\" (see below) "
 "another file could be specified without the extension \".module\"; it should "
@@ -427,13 +397,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:84
+#: en/live-boot.7:80
 #, no-wrap
 msgid "B<netboot>[=nfs|cifs]"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:86
+#: en/live-boot.7:82
 msgid ""
 "This tells live-boot to perform a network mount. The parameter \"nfsroot="
 "\" (with optional \"nfsopts=\"), should specify where is the location of the "
@@ -441,24 +411,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:86
+#: en/live-boot.7:82
 #, no-wrap
 msgid "B<nfsopts>="
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:88
+#: en/live-boot.7:84
 msgid "This lets you specify custom nfs options."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:88
+#: en/live-boot.7:84
 #, no-wrap
 msgid "B<nofastboot>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:90
+#: en/live-boot.7:86
 msgid ""
 "This parameter disables the default disabling of filesystem checks in /etc/"
 "fstab. If you have static filesystems on your harddisk and you want them to "
@@ -466,48 +436,48 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:90
+#: en/live-boot.7:86
 #, no-wrap
 msgid "B<nopersistent>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:92
+#: en/live-boot.7:88
 msgid ""
 "disables the \"persistent\" feature, useful if the bootloader (like "
 "syslinux) has been installed with persistent enabled."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:92
+#: en/live-boot.7:88
 #, no-wrap
 msgid "B<noprompt>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:94
+#: en/live-boot.7:90
 msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:94
+#: en/live-boot.7:90
 #, no-wrap
 msgid "B<swapon>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:96
+#: en/live-boot.7:92
 msgid "This parameter enables usage of local swap partitions."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:96
+#: en/live-boot.7:92
 #, no-wrap
 msgid "B<noxautoconfig>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:98
+#: en/live-boot.7:94
 msgid ""
 "This parameter disables Xorg auto-reconfiguration at boot time. This is "
 "valuable if you either do the detection on your own, or, if you want to ship "
@@ -515,13 +485,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:98
+#: en/live-boot.7:94
 #, no-wrap
 msgid "B<persistent>[=nofiles]"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:100
+#: en/live-boot.7:96
 msgid ""
 "live-boot will look for persistent and snapshot partitions or files labeled "
 "\"live-rw\", \"home-rw\", and files called \"live-sn*\", \"home-sn*\" and "
@@ -535,13 +505,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:100
+#: en/live-boot.7:96
 #, no-wrap
 msgid "B<persistent-path>=I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:102
+#: en/live-boot.7:98
 msgid ""
 "live-boot will look for persistency files in the root directory of a "
 "partition, with this parameter, the path can be configured so that you can "
@@ -549,26 +519,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:102
+#: en/live-boot.7:98
 #, no-wrap
 msgid "{B<preseed/file>|B<file>}=I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:104
+#: en/live-boot.7:100
 msgid ""
 "A path to a file present on the rootfs could be used to preseed debconf "
 "database."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:104
+#: en/live-boot.7:100
 #, no-wrap
 msgid "B<package/question>=I<VALUE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:106
+#: en/live-boot.7:102
 msgid ""
 "All debian installed packages could be preseeded from command-line that way, "
 "beware of blanks spaces, they will interfere with parsing, use a preseed "
@@ -576,26 +546,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:106
+#: en/live-boot.7:102
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:108
+#: en/live-boot.7:104
 msgid ""
 "This option causes live-boot to reboot without attempting to eject the media "
 "and without asking the user to remove the boot media."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:108
+#: en/live-boot.7:104
 #, no-wrap
 msgid "B<showmounts>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:110
+#: en/live-boot.7:106
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -604,38 +574,38 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:110
+#: en/live-boot.7:106
 #, no-wrap
 msgid "B<silent>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:112
+#: en/live-boot.7:108
 msgid ""
 "If you boot with the normal quiet parameter, live-boot hides most messages "
 "of its own. When adding silent, it hides all."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:112
+#: en/live-boot.7:108
 #, no-wrap
 msgid "B<textonly>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:114
+#: en/live-boot.7:110
 msgid ""
 "Start up to text-mode shell prompts, disabling the graphical user interface."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:114
+#: en/live-boot.7:110
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:116
+#: en/live-boot.7:112
 msgid ""
 "Adding this parameter, live-boot will try to copy the entire read-only media "
 "to the specified device before mounting the root filesystem. It probably "
@@ -645,13 +615,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:116
+#: en/live-boot.7:112
 #, no-wrap
 msgid "B<toram>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:118
+#: en/live-boot.7:114
 msgid ""
 "Adding this parameter, live-boot will try to copy the whole read-only media "
 "to the computer's RAM before mounting the root filesystem. This could need a "
@@ -659,71 +629,71 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:118
+#: en/live-boot.7:114
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:120
+#: en/live-boot.7:116
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:120
+#: en/live-boot.7:116
 #, no-wrap
 msgid "B<xdebconf>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:122
+#: en/live-boot.7:118
 msgid ""
 "Uses xdebconfigurator, if present on the rootfs, to configure X instead of "
 "the standard procedure (experimental)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:122
+#: en/live-boot.7:118
 #, no-wrap
 msgid "B<xvideomode>=I<RESOLUTION>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:121
 msgid "Doesn't do xorg autodetection, but enforces a given resolution."
 msgstr ""
 
 #.  FIXME
 #. type: SH
-#: en/live-boot.7:127
+#: en/live-boot.7:123
 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:128 en/live-snapshot.1:43
+#: en/live-boot.7:124 en/live-snapshot.1:43
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:130 en/live-snapshot.1:45
+#: en/live-boot.7:126 en/live-snapshot.1:45
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:130 en/live-snapshot.1:45
+#: en/live-boot.7:126 en/live-snapshot.1:45
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:132 en/live-snapshot.1:47
+#: en/live-boot.7:128 en/live-snapshot.1:47
 msgid ""
 "This optional file (inside the live media) contains a list of white-space or "
 "carriage-return-separated file names corresponding to disk images in the \"/"
@@ -736,13 +706,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:132 en/live-snapshot.1:47
+#: en/live-boot.7:128 en/live-snapshot.1:47
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:134 en/live-snapshot.1:49
+#: en/live-boot.7:130 en/live-snapshot.1:49
 msgid ""
 "This optional file (which resides in the rootfs system, not in the live "
 "media) is used as a list of directories which not need be persistent: ie. "
@@ -751,7 +721,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:51
+#: en/live-boot.7:133 en/live-snapshot.1:51
 msgid ""
 "This saves expensive writes and speeds up operations on volatile data such "
 "as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -760,64 +730,64 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:138 en/live-snapshot.1:42
+#: en/live-boot.7:134 en/live-snapshot.1:42
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:139
+#: en/live-boot.7:135
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:140
+#: en/live-boot.7:136
 #, no-wrap
 msgid "B</etc/live/boot.conf.d/>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:141
+#: en/live-boot.7:137
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:142
+#: en/live-boot.7:138
 #, no-wrap
 msgid "B<live/boot.conf.d/>"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:144 en/live-snapshot.1:52
+#: en/live-boot.7:140 en/live-snapshot.1:52
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:146
+#: en/live-boot.7:142
 msgid "I<live-snapshot>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:148 en/live-snapshot.1:56
+#: en/live-boot.7:144 en/live-snapshot.1:56
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:58
+#: en/live-boot.7:146 en/live-snapshot.1:58
 msgid "I<live-helper>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:59
+#: en/live-boot.7:147 en/live-snapshot.1:59
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:61
+#: en/live-boot.7:149 en/live-snapshot.1:61
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -825,13 +795,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:62
+#: en/live-boot.7:150 en/live-snapshot.1:62
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:64
+#: en/live-boot.7:152 en/live-snapshot.1:64
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -840,13 +810,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:65
+#: en/live-boot.7:153 en/live-snapshot.1:65
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:66
+#: en/live-boot.7:154 en/live-snapshot.1:66
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."

diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index db56633..19d934e 100644 (file)
--- 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-05 14:11+0300\n"
+"POT-Creation-Date: 2010-06-08 06:01+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"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-06-05"
+msgid "2010-06-08"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a5"
+msgid "2.0~a6"
 msgstr ""
 
 #. type: TH
@@ -58,26 +58,26 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:128 en/live-snapshot.1:43
+#: en/live-boot.7:124 en/live-snapshot.1:43
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:130 en/live-snapshot.1:45
+#: en/live-boot.7:126 en/live-snapshot.1:45
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:130 en/live-snapshot.1:45
+#: en/live-boot.7:126 en/live-snapshot.1:45
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:132 en/live-snapshot.1:47
+#: en/live-boot.7:128 en/live-snapshot.1:47
 msgid ""
 "This optional file (inside the live media) contains a list of white-space or "
 "carriage-return-separated file names corresponding to disk images in the \"/"
@@ -90,13 +90,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:132 en/live-snapshot.1:47
+#: en/live-boot.7:128 en/live-snapshot.1:47
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:134 en/live-snapshot.1:49
+#: en/live-boot.7:130 en/live-snapshot.1:49
 msgid ""
 "This optional file (which resides in the rootfs system, not in the live "
 "media) is used as a list of directories which not need be persistent: ie. "
@@ -105,7 +105,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:51
+#: en/live-boot.7:133 en/live-snapshot.1:51
 msgid ""
 "This saves expensive writes and speeds up operations on volatile data such "
 "as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -114,35 +114,35 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:138 en/live-snapshot.1:42
+#: en/live-boot.7:134 en/live-snapshot.1:42
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:144 en/live-snapshot.1:52
+#: en/live-boot.7:140 en/live-snapshot.1:52
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:148 en/live-snapshot.1:56
+#: en/live-boot.7:144 en/live-snapshot.1:56
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:58
+#: en/live-boot.7:146 en/live-snapshot.1:58
 msgid "I<live-helper>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:59
+#: en/live-boot.7:147 en/live-snapshot.1:59
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:61
+#: en/live-boot.7:149 en/live-snapshot.1:61
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -150,13 +150,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:62
+#: en/live-boot.7:150 en/live-snapshot.1:62
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:64
+#: en/live-boot.7:152 en/live-snapshot.1:64
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -165,13 +165,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:65
+#: en/live-boot.7:153 en/live-snapshot.1:65
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:66
+#: en/live-boot.7:154 en/live-snapshot.1:66
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."

diff --git a/scripts/live b/scripts/live
index 3e604f6..7ee3e7f 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -150,31 +150,6 @@ Arguments ()
                                export STATICIP
                                ;;
 
-                       keyb=*|kbd-chooser/method=*)
-                               KBD="${ARGUMENT#*=}"
-                               export KBD
-                               ;;
-
-                       klayout=*|console-setup/layoutcode=*)
-                               KLAYOUT="${ARGUMENT#*=}"
-                               export KLAYOUT
-                               ;;
-
-                       kvariant=*|console-setup/variantcode=*)
-                               KVARIANT="${ARGUMENT#*=}"
-                               export KVARIANT
-                               ;;
-
-                       kmodel=*|console-setup/modelcode=*)
-                               KMODEL="${ARGUMENT#*=}"
-                               export KMODEL
-                               ;;
-
-                       koptions=*)
-                               KOPTIONS="${ARGUMENT#koptions=}"
-                               export KOPTIONS
-                               ;;
-
                        live-getty)
                                LIVE_GETTY="1"
                                export LIVE_GETTY
@@ -235,11 +210,6 @@ Arguments ()
                                export NOAUTOLOGIN
                                ;;
 
-                       noconsolekeyboard)
-                               NOCONSOLEKEYBOARD="Yes"
-                               export NOCONSOLEKEYBOARD
-                               ;;
-
                        nofastboot)
                                NOFASTBOOT="Yes"
                                export NOFASTBOOT
@@ -776,6 +746,7 @@ do_httpmount ()
                                                fi
                                                modprobe fuse
                                                $FUSE_MOUNT "${url}" "${dest}"
+                                               FUSE_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )"
                                        fi
                                        [ ${?} -eq 0 ] && rc=0
                                        [ "${extension}" = "tgz" ] && live_dest="ram"
@@ -806,6 +777,9 @@ do_httpmount ()
        elif [ "${webfile}"  != "FETCH" ] ; then
                NETBOOT="${webfile}"
                export NETBOOT
+               if [ -n "${FUSE_PID}" ] ; then
+                       echo "${FUSE_PID}" > ${mountpoint}/root.pid
+               fi
        fi
 
        return ${rc}

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
deleted file mode 100755 (executable)
index 5a262fa..0000000
--- a/scripts/live-bottom/19keyboard
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-       echo "${PREREQ}"
-}
-
-case "${1}" in
-       prereqs)
-               prereqs
-               exit 0
-               ;;
-esac
-
-# live-boot header
-
-if [ -n "${NOCONSOLEKEYBOARD}" ]
-then
-       exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Setting up console keyboard"
-
-# live-boot script
-
-kbd=
-cslayout=
-csvariant=
-csmodel=
-
-# commandline
-if [ -n "${KBD}" ]
-then
-       kbd="${KBD}"
-else
-       kbd=us
-fi
-
-really_export kbd
-
-if [ -n "${KLAYOUT}" ]
-then
-       cslayout="${KLAYOUT}"
-fi
-
-if [ -n "${KVARIANT}" ]
-then
-       csvariant="${KVARIANT}"
-fi
-
-if [ -n "${KMODEL}" ]
-then
-       csmodel="${KMODEL}"
-fi
-
-if [ -x /root/bin/setupcon ]
-then
-       if [ -f /root/etc/default/keyboard ]
-       then
-               # squeeze
-               KEYBOARD_FILE="/etc/default/keyboard"
-       elif [ -f /root/etc/default/console-setup ]
-       then
-               # lenny
-               KEYBOARD_FILE="/etc/default/console-setup"
-       fi
-
-       if [ -n "/root${KEYBOARD_FILE}" ]
-       then
-               if [ "${cslayout}" ]
-               then
-                       chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"${cslayout}\"/" \
-                       ${KEYBOARD_FILE}
-
-                       if [ "${csvariant}" ]
-                       then
-                               chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"${csvariant}\"/" \
-                               ${KEYBOARD_FILE}
-                       else
-                               live-preseed /root console-setup/variantcode '' false
-                       fi
-
-                       if [ "${csmodel}" ]
-                       then
-                               chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"${csmodel}\"/" \
-                               ${KEYBOARD_FILE}
-                       else
-                               live-preseed /root console-setup/modelcode '' false
-                       fi
-               else
-                       live-preseed /root console-setup/layoutcode '' false
-                       live-preseed /root console-setup/variantcode '' false
-                       live-preseed /root console-setup/modelcode '' false
-               fi
-
-               live-preseed /root console-setup/optionscode '' false
-               live-preseed /root console-setup/codesetcode '' false
-
-               if [ -f /root/etc/init.d/usplash ]
-               then
-                       sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
-               elif [ -f /root/etc/init/usplash.conf ]
-               then
-                       sed -i '/^post-stop script/a\
-    setupcon' /root/etc/init/usplash.conf
-               fi
-       fi
-elif [ -e /root/usr/sbin/install-keymap ]
-then
-       chroot /root /usr/sbin/install-keymap ${kbd}
-       live-preseed /root debian-installer/keymap "${kbd}"
-       live-preseed /root kbd-chooser/method "${kbd}"
-fi
-
-log_end_msg

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
deleted file mode 100755 (executable)
index b82d2aa..0000000
--- a/scripts/live-bottom/25configure_init
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-       echo "${PREREQ}"
-}
-
-case "${1}" in
-       prereqs)
-               prereqs
-               exit 0
-               ;;
-esac
-
-# live-boot header
-
-. /scripts/live-functions
-
-log_begin_msg "Setting up init"
-
-# live-boot script
-
-# Arrange for shells on virtual consoles, rather than login prompts
-
-USERNAME="user"
-
-if [ -z "${NOAUTOLOGIN}" ] && [ -n "${USERNAME}" ]
-then
-       if [ ! -z "${LIVE_GETTY}" ]
-       then
-               if echo "${DEFCONSOLE}" | grep -qs ttyS
-               then
-                       # AUTOMATIC SERIAL CONSOLE #
-                       PORT=$(echo "${DEFCONSOLE}" | \
-                               sed -e 's%,.*%%')
-                       SPEED=$(echo "${DEFCONSOLE}" | \
-                               sed -e 's%ttyS[0-9]\+,%%' \
-                               -e's%\([0-9]\+\).*%\1%')
-
-                       if ! ( sed -n -e'/^[^#]/p' /root/etc/inittab | grep -qs ":respawn:/sbin/getty.*${PORT}" )
-                       then
-                               IDs="A B C D E F G H I J K L M N O P Q R S T Q U V V X Y Z 0 1 2 3 4 5 6 7 8 9"
-
-                               for ID1 in ${IDs}
-                               do
-                                       for ID2 in ${IDs}
-                                       do
-                                               ID="${ID1}${ID2}"
-
-                                               if ! grep "^${ID}:" /etc/inittab
-                                               then
-                                                       #make sure it is not already in use
-                                                       break 2
-                                               fi
-                                       done
-                               done
-
-                               echo "${ID}:2345:respawn:/sbin/live-getty -L ${PORT} ${SPEED} vt100" >> /root/etc/inittab
-                       fi
-               fi
-
-               if [ -f /root/etc/inittab ]
-               then
-                       sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/live-getty%' /root/etc/inittab
-               fi
-       else
-               if [ -f /root/etc/inittab ]
-               then
-                       sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f ${USERNAME} </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
-               fi
-
-               if [ "/root/etc/init/tty*" != "$(echo /root/etc/init/tty*)" ]
-               then
-                       for f in /root/etc/init/tty*
-                       do
-                               sed -i -e "s|^exec.*|exec /bin/login -f $USERNAME </dev/$(basename $f .conf) > /dev/$(basename $f .conf) 2>\&1|" $f
-                       done
-               fi
-       fi
-
-       # Since we use autologin, lastlog doesn't make sense on the console.
-       sed -i '/^[^#].*pam_lastlog\.so/s/^/# /' /root/etc/pam.d/login
-fi
-
-# do not try to remove files if using file-rc
-if [ -d /root/etc/rc0.d ]
-then
-       # This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
-       # /etc/crontab remaining disabled, yet also not run by anacron
-       if [ -x /root/usr/sbin/anacron ]
-       then
-               chroot /root dpkg-divert --add --rename --quiet /usr/sbin/anacron
-               ln -s /bin/true /root/usr/sbin/anacron
-       fi
-
-       # Avoid clobbering the user's clock
-       rm -f /root/etc/rc?.d/K??hwclock.sh /root/etc/init/hwclock-save.conf
-fi
-
-# Disable readahead since it doesn't play well with squashfs + unionfs
-# use chmod instead of mv to not trigger unionfs bugs.
-if [ -e /root/sbin/readahead-list ]
-then
-       chmod -x /root/sbin/readahead-list
-fi
-
-# Disable ureadahead too since we don't ship a pack file for it anyway, so
-# all we'll end up doing is profiling the live CD boot. ureadahead also
-# breaks partman occasionally by reading from its synchronisation FIFOs.
-rm -f /root/etc/init/ureadahead.conf
-
-log_end_msg
-
-exit 0