[SCM] live-boot branch, debian, updated. debian/2.0_a5-1-8-gcdf7e50
Daniel Baumann
daniel at debian.org
Tue Jun 8 04:09:03 UTC 2010
The following commit has been merged in the debian branch:
commit ef9f9d1a53b14e80cfd48fa0ee6299aa53533d52
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 7 15:37:08 2010 +0200
Removing configure_init bottom script, live-config takes care about that now.
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index bf4a3df..96cccbf 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 2010\-06\-07 2.0~a5 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 07.06.2010 2.0~a5 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
@@ -98,11 +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 \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 a332139..ade98da 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 2010\-06\-07 2.0~a5 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 07.06.2010 2.0~a5 "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 f56263a..fca2691 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -63,8 +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 "\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/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 21e700d..e1633ef 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 2.0~a5\n"
-"POT-Creation-Date: 2010-06-07 11:47+0300\n"
+"POT-Creation-Date: 2010-06-07 15:37+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -23,6 +23,7 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
+#, no-wrap
msgid "2010-06-07"
msgstr "07.06.2010"
@@ -310,26 +311,11 @@ msgstr ""
#. type: IP
#: en/live-boot.7:66
#, no-wrap
-msgid "B<live-getty>"
-msgstr "B<live-getty>"
-
-#. type: Plain text
-#: en/live-boot.7:68
-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:68
-#, 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:70
+#: 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 "
@@ -338,7 +324,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:72
+#: 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. "
@@ -347,13 +333,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:72
+#: 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:74
+#: 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\" "
@@ -361,13 +347,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:74
+#: 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:76
+#: 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 "
@@ -376,13 +362,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:76
+#: 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:78
+#: 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 "
@@ -390,26 +376,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:78
+#: 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:80
+#: 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:80
+#: en/live-boot.7:78
#, no-wrap
msgid "B<module>=I<NAME>"
msgstr "B<module>=I<NAME>"
#. type: Plain text
-#: en/live-boot.7:82
+#: 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 "
@@ -417,13 +403,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:82
+#: en/live-boot.7:80
#, no-wrap
msgid "B<netboot>[=nfs|cifs]"
msgstr "B<netboot>[=nfs|cifs]"
#. type: Plain text
-#: en/live-boot.7:84
+#: 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 "
@@ -431,24 +417,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:84
+#: en/live-boot.7:82
#, no-wrap
msgid "B<nfsopts>="
msgstr "B<nfsopts>="
#. type: Plain text
-#: en/live-boot.7:86
+#: en/live-boot.7:84
msgid "This lets you specify custom nfs options."
msgstr ""
#. type: IP
-#: en/live-boot.7:86
+#: en/live-boot.7:84
#, no-wrap
msgid "B<nofastboot>"
msgstr "B<nofastboot>"
#. type: Plain text
-#: en/live-boot.7:88
+#: 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 "
@@ -456,48 +442,48 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:88
+#: en/live-boot.7:86
#, no-wrap
msgid "B<nopersistent>"
msgstr "B<nopersistent>"
#. type: Plain text
-#: en/live-boot.7:90
+#: 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:90
+#: en/live-boot.7:88
#, no-wrap
msgid "B<noprompt>"
msgstr "B<noprompt>"
#. type: Plain text
-#: en/live-boot.7:92
+#: 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:92
+#: en/live-boot.7:90
#, no-wrap
msgid "B<swapon>"
msgstr "B<swapon>"
#. type: Plain text
-#: en/live-boot.7:94
+#: en/live-boot.7:92
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:94
+#: en/live-boot.7:92
#, no-wrap
msgid "B<noxautoconfig>"
msgstr "B<noxautoconfig>"
#. type: Plain text
-#: en/live-boot.7:96
+#: 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 "
@@ -505,13 +491,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:96
+#: en/live-boot.7:94
#, no-wrap
msgid "B<persistent>[=nofiles]"
msgstr "B<persistent>[=nofiles]"
#. type: Plain text
-#: en/live-boot.7:98
+#: 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 "
@@ -525,13 +511,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:98
+#: 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:100
+#: 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 "
@@ -539,26 +525,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:100
+#: 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:102
+#: 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:102
+#: 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:104
+#: 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 "
@@ -566,26 +552,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:104
+#: en/live-boot.7:102
#, no-wrap
msgid "B<quickreboot>"
msgstr "B<quickreboot>"
#. type: Plain text
-#: en/live-boot.7:106
+#: 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:106
+#: en/live-boot.7:104
#, no-wrap
msgid "B<showmounts>"
msgstr "B<showmounts>"
#. type: Plain text
-#: en/live-boot.7:108
+#: 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 "
@@ -594,38 +580,38 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:108
+#: en/live-boot.7:106
#, no-wrap
msgid "B<silent>"
msgstr "B<silent>"
#. type: Plain text
-#: en/live-boot.7:110
+#: 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:110
+#: en/live-boot.7:108
#, no-wrap
msgid "B<textonly>"
msgstr "B<textonly>"
#. type: Plain text
-#: en/live-boot.7:112
+#: 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:112
+#: en/live-boot.7:110
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr "B<todisk>=I<DEVICE>"
#. type: Plain text
-#: en/live-boot.7:114
+#: 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 "
@@ -635,13 +621,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:114
+#: en/live-boot.7:112
#, no-wrap
msgid "B<toram>"
msgstr "B<toram>"
#. type: Plain text
-#: en/live-boot.7:116
+#: 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 "
@@ -649,71 +635,71 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:116
+#: en/live-boot.7:114
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr "B<union>=aufs|unionfs"
#. type: Plain text
-#: en/live-boot.7:118
+#: 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:118
+#: en/live-boot.7:116
#, no-wrap
msgid "B<xdebconf>"
msgstr "B<xdebconf>"
#. type: Plain text
-#: en/live-boot.7:120
+#: 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:120
+#: 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:123
+#: en/live-boot.7:121
msgid "Doesn't do xorg autodetection, but enforces a given resolution."
msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:125
+#: en/live-boot.7:123
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:126 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:128 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:128 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:130 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 \"/"
@@ -726,13 +712,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:130 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:132 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. "
@@ -741,7 +727,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:135 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 "
@@ -750,64 +736,64 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:136 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:137
+#: 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:138
+#: 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:139
+#: en/live-boot.7:137
#, no-wrap
msgid "B<live/boot.conf>"
msgstr "B<live/boot.conf>"
#. type: IP
-#: en/live-boot.7:140
+#: 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:142 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:144
+#: en/live-boot.7:142
msgid "I<live-snapshot>(1)"
msgstr "I<live-snapshot>(1)"
#. type: Plain text
-#: en/live-boot.7:146 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:148 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:149 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:151 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 "
@@ -818,13 +804,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:152 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:154 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 "
@@ -838,13 +824,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:155 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:156 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 at 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 de99963..1523d0d 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -23,6 +23,7 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
+#, no-wrap
msgid "2010-06-07"
msgstr "07.06.2010"
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index e2a09f3..3e836ee 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-07 11:47+0300\n"
+"POT-Creation-Date: 2010-06-07 15:37+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -305,26 +305,11 @@ msgstr ""
#. type: IP
#: en/live-boot.7:66
#, no-wrap
-msgid "B<live-getty>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:68
-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:68
-#, no-wrap
msgid "{B<live-media>|B<bootfrom>}=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:70
+#: 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 "
@@ -333,7 +318,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:72
+#: 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. "
@@ -342,13 +327,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:72
+#: en/live-boot.7:70
#, no-wrap
msgid "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:74
+#: 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\" "
@@ -356,13 +341,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:74
+#: en/live-boot.7:72
#, no-wrap
msgid "B<live-media-offset>=I<BYTES>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:76
+#: 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 "
@@ -371,13 +356,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:76
+#: en/live-boot.7:74
#, no-wrap
msgid "B<live-media-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:78
+#: 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 "
@@ -385,26 +370,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:78
+#: en/live-boot.7:76
#, no-wrap
msgid "B<live-media-timeout>=I<SECONDS>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:80
+#: 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:80
+#: en/live-boot.7:78
#, no-wrap
msgid "B<module>=I<NAME>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:82
+#: 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 "
@@ -412,13 +397,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:82
+#: en/live-boot.7:80
#, no-wrap
msgid "B<netboot>[=nfs|cifs]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:84
+#: 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 "
@@ -426,24 +411,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:84
+#: en/live-boot.7:82
#, no-wrap
msgid "B<nfsopts>="
msgstr ""
#. type: Plain text
-#: en/live-boot.7:86
+#: en/live-boot.7:84
msgid "This lets you specify custom nfs options."
msgstr ""
#. type: IP
-#: en/live-boot.7:86
+#: en/live-boot.7:84
#, no-wrap
msgid "B<nofastboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:88
+#: 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 "
@@ -451,48 +436,48 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:88
+#: en/live-boot.7:86
#, no-wrap
msgid "B<nopersistent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:90
+#: 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:90
+#: en/live-boot.7:88
#, no-wrap
msgid "B<noprompt>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:92
+#: 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:92
+#: en/live-boot.7:90
#, no-wrap
msgid "B<swapon>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:94
+#: en/live-boot.7:92
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:94
+#: en/live-boot.7:92
#, no-wrap
msgid "B<noxautoconfig>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:96
+#: 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 "
@@ -500,13 +485,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:96
+#: en/live-boot.7:94
#, no-wrap
msgid "B<persistent>[=nofiles]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:98
+#: 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 "
@@ -520,13 +505,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:98
+#: en/live-boot.7:96
#, no-wrap
msgid "B<persistent-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:100
+#: 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 "
@@ -534,26 +519,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:100
+#: en/live-boot.7:98
#, no-wrap
msgid "{B<preseed/file>|B<file>}=I<FILE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:102
+#: 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:102
+#: en/live-boot.7:100
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:104
+#: 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 "
@@ -561,26 +546,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:104
+#: en/live-boot.7:102
#, no-wrap
msgid "B<quickreboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:106
+#: 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:106
+#: en/live-boot.7:104
#, no-wrap
msgid "B<showmounts>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:108
+#: 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 "
@@ -589,38 +574,38 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:108
+#: en/live-boot.7:106
#, no-wrap
msgid "B<silent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:110
+#: 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:110
+#: en/live-boot.7:108
#, no-wrap
msgid "B<textonly>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:112
+#: 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:112
+#: en/live-boot.7:110
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:114
+#: 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 "
@@ -630,13 +615,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:114
+#: en/live-boot.7:112
#, no-wrap
msgid "B<toram>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:116
+#: 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 "
@@ -644,71 +629,71 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:116
+#: en/live-boot.7:114
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:118
+#: 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:118
+#: en/live-boot.7:116
#, no-wrap
msgid "B<xdebconf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:120
+#: 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:120
+#: en/live-boot.7:118
#, no-wrap
msgid "B<xvideomode>=I<RESOLUTION>"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:121
msgid "Doesn't do xorg autodetection, but enforces a given resolution."
msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:125
+#: en/live-boot.7:123
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:126 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:128 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:128 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:130 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 \"/"
@@ -721,13 +706,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:130 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:132 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. "
@@ -736,7 +721,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:135 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 "
@@ -745,64 +730,64 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:136 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:137
+#: en/live-boot.7:135
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:138
+#: en/live-boot.7:136
#, no-wrap
msgid "B</etc/live/boot.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-boot.7:139
+#: en/live-boot.7:137
#, no-wrap
msgid "B<live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:140
+#: en/live-boot.7:138
#, no-wrap
msgid "B<live/boot.conf.d/>"
msgstr ""
#. type: SH
-#: en/live-boot.7:142 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:144
+#: en/live-boot.7:142
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:146 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:148 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:149 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:151 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 "
@@ -810,13 +795,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:152 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:154 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 "
@@ -825,13 +810,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:155 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:156 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 at debian.org>E<gt> for "
"the Debian project."
diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
deleted file mode 100755
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
--
live-boot
More information about the debian-live-changes
mailing list