[SCM] live-boot branch, debian-next, updated. debian/3.0_a12-1-3-g552f5fb
Daniel Baumann
daniel at debian.org
Mon Nov 29 21:59:24 UTC 2010
The following commit has been merged in the debian-next branch:
commit 552f5fb888effdb737d08bc18bf460c60cc3354a
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Nov 29 22:59:00 2010 +0100
Adding support for custom ramdisk size (Closes: #544583).
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index b0e8a9a..4db45f3 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 22.11.2010 3.0~a12 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 29.11.2010 3.0~a12 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
@@ -162,6 +162,11 @@ Do not prompt to eject the CD or remove the USB flash drive on reboot.
.IP \fBnoprompt\fP=\fITYPE\fP 4
This tells live\-boot not to prompt to eject the CD (when noprompt=cd) or
remove the USB flash drive (when noprompt=usb) on reboot.
+.IP \fBramdisk\-size\fP 4
+This parameters allows to set a custom ramdisk size (it's the '\-o size'
+option of tmpfs mount). By default, there is no ramdisk size set, so the
+default of mount applies (currently 50% of available RAM). Note that this
+option has no currently no effect when booting with toram.
.IP \fBswapon\fP 4
This parameter enables usage of local swap partitions.
.IP \fBpersistent\fP[={nofiles|cryptsetup}] 4
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index f6d0041..b8332e8 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 22.11.2010 3.0~a12 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 29.11.2010 3.0~a12 "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 17c0935..3ae212d 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-11\-22 3.0~a12 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-11\-29 3.0~a12 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
@@ -100,6 +100,8 @@ disables the "persistent" feature, useful if the bootloader (like syslinux) has
Do not prompt to eject the CD or remove the USB flash drive on reboot.
.IP "\fBnoprompt\fR=\fITYPE\fR" 4
This tells live-boot not to prompt to eject the CD (when noprompt=cd) or remove the USB flash drive (when noprompt=usb) on reboot.
+.IP "\fBramdisk\-size\fR" 4
+This parameters allows to set a custom ramdisk size (it's the '\-o size' option of tmpfs mount). By default, there is no ramdisk size set, so the default of mount applies (currently 50% of available RAM). Note that this option has no currently no effect when booting with toram.
.IP "\fBswapon\fR" 4
This parameter enables usage of local swap partitions.
.IP "\fBpersistent\fR[={nofiles|cryptsetup}]" 4
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 74df415..2183edf 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-11\-22 3.0~a12 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-11\-29 3.0~a12 "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 aeb90fd..0e64c45 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 3.0~a12\n"
-"POT-Creation-Date: 2010-11-22 23:30+0100\n"
+"POT-Creation-Date: 2010-11-29 22:58+0100\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,8 +24,8 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-11-22"
-msgstr "22.11.2010"
+msgid "2010-11-29"
+msgstr "29.11.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -524,22 +524,37 @@ msgstr ""
#. type: IP
#: en/live-boot.7:103
#, no-wrap
+msgid "B<ramdisk-size>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:105
+msgid ""
+"This parameters allows to set a custom ramdisk size (it's the '-o size' "
+"option of tmpfs mount). By default, there is no ramdisk size set, so the "
+"default of mount applies (currently 50% of available RAM). Note that this "
+"option has no currently no effect when booting with toram."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:105
+#, no-wrap
msgid "B<swapon>"
msgstr "B<swapon>"
#. type: Plain text
-#: en/live-boot.7:105
+#: en/live-boot.7:107
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:105
+#: en/live-boot.7:107
#, no-wrap
msgid "B<persistent>[={nofiles|cryptsetup}]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:107
+#: en/live-boot.7:109
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 "
@@ -550,7 +565,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:111
msgid ""
"If \"nofiles\" is specified, only filesystems with matching labels will be "
"searched; no filesystems will be traversed looking for archives or image "
@@ -558,7 +573,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:113
msgid ""
"If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
"will be considered as well as others when searching for a persistence "
@@ -566,13 +581,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:113
#, no-wrap
msgid "B<persistent-path>=I<PATH>"
msgstr "B<persistent-path>=I<PATH>"
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:115
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 "
@@ -580,13 +595,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:115
#, no-wrap
msgid "B<persistent-subtext>=I<SUFFIX>"
msgstr "B<persistent-subtext>=I<SUFFIX>"
#. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:117
msgid ""
"Add a suffix when searching for the image filenames or partition labels to "
"use for the above mentioned persistent feature, the SUFFIX will be added "
@@ -596,26 +611,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:115
+#: en/live-boot.7:117
#, 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:117
+#: en/live-boot.7:119
msgid ""
"A path to a file present on the rootfs could be used to preseed debconf "
"database."
msgstr ""
#. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:119
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr "B<package/question>=I<VALUE>"
#. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:121
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 "
@@ -623,26 +638,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:119
+#: en/live-boot.7:121
#, no-wrap
msgid "B<quickreboot>"
msgstr "B<quickreboot>"
#. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:123
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:121
+#: en/live-boot.7:123
#, no-wrap
msgid "B<showmounts>"
msgstr "B<showmounts>"
#. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:125
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -651,26 +666,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:125
#, no-wrap
msgid "B<silent>"
msgstr "B<silent>"
#. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:127
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:125
+#: en/live-boot.7:127
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr "B<todisk>=I<DEVICE>"
#. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:129
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 "
@@ -680,13 +695,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:127
+#: en/live-boot.7:129
#, no-wrap
msgid "B<toram>"
msgstr "B<toram>"
#. type: Plain text
-#: en/live-boot.7:129
+#: en/live-boot.7:131
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 "
@@ -694,14 +709,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:129
+#: en/live-boot.7:131
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr "B<union>=aufs|unionfs"
#. FIXME
#. type: Plain text
-#: en/live-boot.7:132
+#: en/live-boot.7:134
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -709,32 +724,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:134
+#: en/live-boot.7:136
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:135 en/live-snapshot.1:43
+#: en/live-boot.7:137 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr "B</etc/live.conf>"
#. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:45
+#: en/live-boot.7:139 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:137 en/live-snapshot.1:45
+#: en/live-boot.7:139 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr "B<live/filesystem.module>"
#. type: Plain text
-#: en/live-boot.7:139 en/live-snapshot.1:47
+#: en/live-boot.7:141 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 \"/"
@@ -747,13 +762,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:139 en/live-snapshot.1:47
+#: en/live-boot.7:141 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:141 en/live-snapshot.1:49
+#: en/live-boot.7:143 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. "
@@ -762,7 +777,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:144 en/live-snapshot.1:51
+#: en/live-boot.7:146 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 "
@@ -771,69 +786,69 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:42
+#: en/live-boot.7:147 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-boot.7:146
+#: en/live-boot.7:148
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr "B</etc/live/boot.conf>"
#. type: IP
-#: en/live-boot.7:147
+#: en/live-boot.7:149
#, no-wrap
msgid "B</etc/live/boot.d/>"
msgstr "B</etc/live/boot.d/>"
#. type: IP
-#: en/live-boot.7:148
+#: en/live-boot.7:150
#, no-wrap
msgid "B<live/boot.conf>"
msgstr "B<live/boot.conf>"
#. type: IP
-#: en/live-boot.7:149
+#: en/live-boot.7:151
#, no-wrap
msgid "B<live/boot.d/>"
msgstr "B<live/boot.d/>"
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:54
+#: en/live-boot.7:153 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:153
+#: en/live-boot.7:155
msgid "I<live-snapshot>(1)"
msgstr "I<live-snapshot>(1)"
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:58
+#: en/live-boot.7:157 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-boot.7:157 en/live-snapshot.1:60
+#: en/live-boot.7:159 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:62
+#: en/live-boot.7:161 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-boot.7:160 en/live-snapshot.1:63
+#: en/live-boot.7:162 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:162 en/live-snapshot.1:65
+#: en/live-boot.7:164 en/live-snapshot.1:65
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 "
@@ -844,13 +859,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:163 en/live-snapshot.1:66
+#: en/live-boot.7:165 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:68
+#: en/live-boot.7:167 en/live-snapshot.1:68
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 "
@@ -864,13 +879,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:166 en/live-snapshot.1:69
+#: en/live-boot.7:168 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:167 en/live-snapshot.1:70
+#: en/live-boot.7:169 en/live-snapshot.1:70
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 701b07d..b8290ea 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a12\n"
-"POT-Creation-Date: 2010-11-22 23:30+0100\n"
+"POT-Creation-Date: 2010-11-29 22:58+0100\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,8 +24,8 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-11-22"
-msgstr "22.11.2010"
+msgid "2010-11-29"
+msgstr "29.11.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -58,26 +58,26 @@ msgid "OPTIONS"
msgstr "OPTIONEN"
#. type: IP
-#: en/live-boot.7:135 en/live-snapshot.1:43
+#: en/live-boot.7:137 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr "B</etc/live.conf>"
#. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:45
+#: en/live-boot.7:139 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:137 en/live-snapshot.1:45
+#: en/live-boot.7:139 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr "B<live/filesystem.module>"
#. type: Plain text
-#: en/live-boot.7:139 en/live-snapshot.1:47
+#: en/live-boot.7:141 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:139 en/live-snapshot.1:47
+#: en/live-boot.7:141 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:141 en/live-snapshot.1:49
+#: en/live-boot.7:143 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:144 en/live-snapshot.1:51
+#: en/live-boot.7:146 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,40 +114,40 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:42
+#: en/live-boot.7:147 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:54
+#: en/live-boot.7:153 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:58
+#: en/live-boot.7:157 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-boot.7:157 en/live-snapshot.1:60
+#: en/live-boot.7:159 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:62
+#: en/live-boot.7:161 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-boot.7:160 en/live-snapshot.1:63
+#: en/live-boot.7:162 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:162 en/live-snapshot.1:65
+#: en/live-boot.7:164 en/live-snapshot.1:65
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 "
@@ -158,13 +158,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:163 en/live-snapshot.1:66
+#: en/live-boot.7:165 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:68
+#: en/live-boot.7:167 en/live-snapshot.1:68
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 "
@@ -178,13 +178,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:166 en/live-snapshot.1:69
+#: en/live-boot.7:168 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:167 en/live-snapshot.1:70
+#: en/live-boot.7:169 en/live-snapshot.1:70
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/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 5445c82..5e767be 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-11-22 23:30+0100\n"
+"POT-Creation-Date: 2010-11-29 22:58+0100\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"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-11-22"
+msgid "2010-11-29"
msgstr ""
#. type: TH
@@ -519,22 +519,37 @@ msgstr ""
#. type: IP
#: en/live-boot.7:103
#, no-wrap
-msgid "B<swapon>"
+msgid "B<ramdisk-size>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:105
-msgid "This parameter enables usage of local swap partitions."
+msgid ""
+"This parameters allows to set a custom ramdisk size (it's the '-o size' "
+"option of tmpfs mount). By default, there is no ramdisk size set, so the "
+"default of mount applies (currently 50% of available RAM). Note that this "
+"option has no currently no effect when booting with toram."
msgstr ""
#. type: IP
#: en/live-boot.7:105
#, no-wrap
-msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgid "B<swapon>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:107
+msgid "This parameter enables usage of local swap partitions."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:107
+#, no-wrap
+msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:109
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 "
@@ -545,7 +560,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:111
msgid ""
"If \"nofiles\" is specified, only filesystems with matching labels will be "
"searched; no filesystems will be traversed looking for archives or image "
@@ -553,7 +568,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:113
msgid ""
"If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
"will be considered as well as others when searching for a persistence "
@@ -561,13 +576,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:113
#, no-wrap
msgid "B<persistent-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:115
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 "
@@ -575,13 +590,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:115
#, no-wrap
msgid "B<persistent-subtext>=I<SUFFIX>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:117
msgid ""
"Add a suffix when searching for the image filenames or partition labels to "
"use for the above mentioned persistent feature, the SUFFIX will be added "
@@ -591,26 +606,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:115
+#: en/live-boot.7:117
#, no-wrap
msgid "{B<preseed/file>|B<file>}=I<FILE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:119
msgid ""
"A path to a file present on the rootfs could be used to preseed debconf "
"database."
msgstr ""
#. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:119
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:121
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 "
@@ -618,26 +633,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:119
+#: en/live-boot.7:121
#, no-wrap
msgid "B<quickreboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:123
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:121
+#: en/live-boot.7:123
#, no-wrap
msgid "B<showmounts>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:125
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -646,26 +661,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:125
#, no-wrap
msgid "B<silent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:127
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:125
+#: en/live-boot.7:127
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:129
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 "
@@ -675,13 +690,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:127
+#: en/live-boot.7:129
#, no-wrap
msgid "B<toram>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:129
+#: en/live-boot.7:131
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 "
@@ -689,14 +704,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:129
+#: en/live-boot.7:131
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/live-boot.7:132
+#: en/live-boot.7:134
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -704,32 +719,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:134
+#: en/live-boot.7:136
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:135 en/live-snapshot.1:43
+#: en/live-boot.7:137 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:45
+#: en/live-boot.7:139 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:137 en/live-snapshot.1:45
+#: en/live-boot.7:139 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:139 en/live-snapshot.1:47
+#: en/live-boot.7:141 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 \"/"
@@ -742,13 +757,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:139 en/live-snapshot.1:47
+#: en/live-boot.7:141 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:141 en/live-snapshot.1:49
+#: en/live-boot.7:143 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. "
@@ -757,7 +772,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:144 en/live-snapshot.1:51
+#: en/live-boot.7:146 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 "
@@ -766,69 +781,69 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:42
+#: en/live-boot.7:147 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-boot.7:146
+#: en/live-boot.7:148
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:147
+#: en/live-boot.7:149
#, no-wrap
msgid "B</etc/live/boot.d/>"
msgstr ""
#. type: IP
-#: en/live-boot.7:148
+#: en/live-boot.7:150
#, no-wrap
msgid "B<live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:149
+#: en/live-boot.7:151
#, no-wrap
msgid "B<live/boot.d/>"
msgstr ""
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:54
+#: en/live-boot.7:153 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:153
+#: en/live-boot.7:155
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:58
+#: en/live-boot.7:157 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:157 en/live-snapshot.1:60
+#: en/live-boot.7:159 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:62
+#: en/live-boot.7:161 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:160 en/live-snapshot.1:63
+#: en/live-boot.7:162 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:162 en/live-snapshot.1:65
+#: en/live-boot.7:164 en/live-snapshot.1:65
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 "
@@ -836,13 +851,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:163 en/live-snapshot.1:66
+#: en/live-boot.7:165 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:68
+#: en/live-boot.7:167 en/live-snapshot.1:68
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 +866,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:166 en/live-snapshot.1:69
+#: en/live-boot.7:168 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:167 en/live-snapshot.1:70
+#: en/live-boot.7:169 en/live-snapshot.1:70
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/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index 2033a10..b918cba 100644
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-11-22 23:30+0100\n"
+"POT-Creation-Date: 2010-11-29 22:58+0100\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"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-11-22"
+msgid "2010-11-29"
msgstr ""
#. type: TH
@@ -59,26 +59,26 @@ msgid "OPTIONS"
msgstr ""
#. type: IP
-#: en/live-boot.7:135 en/live-snapshot.1:43
+#: en/live-boot.7:137 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:45
+#: en/live-boot.7:139 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:137 en/live-snapshot.1:45
+#: en/live-boot.7:139 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:139 en/live-snapshot.1:47
+#: en/live-boot.7:141 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 \"/"
@@ -91,13 +91,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:139 en/live-snapshot.1:47
+#: en/live-boot.7:141 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:141 en/live-snapshot.1:49
+#: en/live-boot.7:143 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. "
@@ -106,7 +106,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:144 en/live-snapshot.1:51
+#: en/live-boot.7:146 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 "
@@ -115,40 +115,40 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:42
+#: en/live-boot.7:147 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:54
+#: en/live-boot.7:153 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:58
+#: en/live-boot.7:157 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:157 en/live-snapshot.1:60
+#: en/live-boot.7:159 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:62
+#: en/live-boot.7:161 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:160 en/live-snapshot.1:63
+#: en/live-boot.7:162 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:162 en/live-snapshot.1:65
+#: en/live-boot.7:164 en/live-snapshot.1:65
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 "
@@ -156,13 +156,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:163 en/live-snapshot.1:66
+#: en/live-boot.7:165 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:68
+#: en/live-boot.7:167 en/live-snapshot.1:68
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 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:166 en/live-snapshot.1:69
+#: en/live-boot.7:168 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:167 en/live-snapshot.1:70
+#: en/live-boot.7:169 en/live-snapshot.1:70
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 b/scripts/live
index 90a9333..bf65b9d 100755
--- a/scripts/live
+++ b/scripts/live
@@ -230,6 +230,10 @@ Arguments ()
export NONETWORKING
;;
+ ramdisk-size=*)
+ ramdisk_size="${ARGUMENT#ramdisk-size=}"
+ ;;
+
swapon)
SWAPON="Yes"
export SWAPON
@@ -539,6 +543,13 @@ copy_live_to ()
return 1
fi
+ # Custom ramdisk size
+ if [ -z "${mount_options}" ] && [ -n "${ramdisk_size}" ]
+ then
+ # FIXME: should check for wrong values
+ mount_options="-o size=${ramdisk_size}"
+ fi
+
# begin copying (or uncompressing)
mkdir "${copyto}"
log_begin_msg "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
--
live-boot
More information about the debian-live-changes
mailing list