[SCM] live-boot branch, debian-next, updated. debian/3.0_a26-1-6-gd0610b3

Sun Apr 8 10:29:04 UTC 2012

The following commit has been merged in the debian-next branch:
commit d0610b388dde7a4368580b60c690d72fb3f72637
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Apr 8 12:28:23 2012 +0200

    Consistently using ext4 in all examples, not a mix of ext2 and ext3.

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 91e2c02..ad922e5 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -182,7 +182,7 @@ either "live\-sn" or "home\-sn" and will be extracted into / or /home,
 respectively (see \fIlive\-snapshot\fP(1) for more information). The order these
 are handled are: full\-ov, custom\-ov, live\-sn, home\-sn. Overlay image files
 and snapshot archive files have extensions which determines their filesystem
-or archive type, e.g. "custom\-ov.ext3" and "\home\-sn.squashfs".
+or archive type, e.g. "custom\-ov.ext4" and "\home\-sn.squashfs".
 .IP "\fBpersistent\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
 This option determines which types of encryption that we allow to be used
 when probing devices for persistent media. If "none" is in the list, we
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 7c0065e..57b833a 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -29,13 +29,13 @@ by the live\-boot init script to resync the boot\-found snapshots devices.
 .IP "\-c, \-\-cow \fIDIRECTORY\fP" 4
 specifies the input directory to be cloned in the image file. Its default
 value "/live/cow" should be right for most uses. However it could be handy
-to specify "/home" and type ext2 for the type to prepare an image file
+to specify "/home" and type ext4 for the type to prepare an image file
 suited to be directly mounted by live\-boot as home.
 .IP "\-d, \-\-device \fIDEVICE\fP" 4
 sets the device where the media which the snapshot/persistence
 file/partition will be put. If it is not specified, a tmpfs will be used and
 linked to the user's desktop to move it where it is needed. If the device
-has no filesystem, an ext2 fs will be automatically created and labelled
+has no filesystem, an ext4 fs will be automatically created and labelled
 according to the values specified after the "\-\-output" value or with a sane
 default.
 .IP "\-e, \-\-exclude\-list \fIFILE\fP" 4
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 0c5f93d..ed66ad7 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -107,7 +107,7 @@ This parameters allows to set a custom ramdisk size (it's the '\-o size' option
 .IP "\fBswapon\fR" 4
 This parameter enables usage of local swap partitions.
 .IP "\fBpersistent\fR" 4
-live\-boot will probe devices for persistent media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image/archive files (with the correct file name). Overlays are labeled/named either "full\-ov", which will be mounted on /, or "custom\-ov", which can be completely customized (see \fIlive.persist\fR(5)); snapshots are labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or /home, respectively (see \fIlive\-snapshot\fR(1) for more information). The order these are handled are: full\-ov, custom\-ov, live-sn, home-sn. Overlay image files and snapshot archive files have extensions which determines their filesystem or archive type, e.g. "custom\-ov.ext3" and "\home\-sn.squashfs".
+live\-boot will probe devices for persistent media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image/archive files (with the correct file name). Overlays are labeled/named either "full\-ov", which will be mounted on /, or "custom\-ov", which can be completely customized (see \fIlive.persist\fR(5)); snapshots are labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or /home, respectively (see \fIlive\-snapshot\fR(1) for more information). The order these are handled are: full\-ov, custom\-ov, live-sn, home-sn. Overlay image files and snapshot archive files have extensions which determines their filesystem or archive type, e.g. "custom\-ov.ext4" and "\home\-sn.squashfs".
 .IP "\fBpersistent\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
 This option determines which types of encryption that we allow to be used when probing devices for persistent media. If "none" is in the list, we allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none".
 .IP "\fBpersistent\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 2e2e296..72a08dd 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -19,9 +19,9 @@ live\-snapshot is a script which can be used to build the right types of persist
 
 .SH OPTIONS
 .IP "\-c, \-\-cow \fIDIRECTORY\fR" 4
-specifies the input directory to be cloned in the image file. Its default value "/live/cow" should be right for most uses. However it could be handy to specify "/home" and type ext2 for the type to prepare an image file suited to be directly mounted by live\-boot as home.
+specifies the input directory to be cloned in the image file. Its default value "/live/cow" should be right for most uses. However it could be handy to specify "/home" and type ext4 for the type to prepare an image file suited to be directly mounted by live\-boot as home.
 .IP "\-d, \-\-device \fIDEVICE\fR" 4
-sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext2 fs will be automatically created and labelled according to the values specified after the "\-\-output" value or with a sane default.
+sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext4 fs will be automatically created and labelled according to the values specified after the "\-\-output" value or with a sane default.
 .IP "\-e, \-\-exclude\-list \fIFILE\fR" 4
 a file containing a list of filenames/paths that should not be saved. This exclude list will be remebered on the target snapshot media for reuse.
 .IP "\-o, \-\-output \fIFILE\fR" 4
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 3bc33f5..f5ef46c 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~a26\n"
-"POT-Creation-Date: 2012-04-08 11:41+0300\n"
+"POT-Creation-Date: 2012-04-08 12:28+0300\n"
 "PO-Revision-Date: 2012-04-05 08:11+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -566,7 +566,7 @@ msgid ""
 "home, respectively (see I<live-snapshot>(1) for more information). The order "
 "these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay image "
 "files and snapshot archive files have extensions which determines their "
-"filesystem or archive type, e.g. \"custom-ov.ext3\" and \"\\home-sn.squashfs"
+"filesystem or archive type, e.g. \"custom-ov.ext4\" and \"\\home-sn.squashfs"
 "\"."
 msgstr ""
 
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 73c2d08..116f878 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~a26-1\n"
-"POT-Creation-Date: 2012-04-08 11:41+0300\n"
+"POT-Creation-Date: 2012-04-08 12:28+0300\n"
 "PO-Revision-Date: 2012-04-05 08:11+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -239,7 +239,7 @@ msgstr ""
 msgid ""
 "specifies the input directory to be cloned in the image file. Its default "
 "value \"/live/cow\" should be right for most uses. However it could be handy "
-"to specify \"/home\" and type ext2 for the type to prepare an image file "
+"to specify \"/home\" and type ext4 for the type to prepare an image file "
 "suited to be directly mounted by live-boot as home."
 msgstr ""
 
@@ -255,7 +255,7 @@ msgid ""
 "sets the device where the media which the snapshot/persistence file/"
 "partition will be put. If it is not specified, a tmpfs will be used and "
 "linked to the user's desktop to move it where it is needed. If the device "
-"has no filesystem, an ext2 fs will be automatically created and labelled "
+"has no filesystem, an ext4 fs will be automatically created and labelled "
 "according to the values specified after the \"--output\" value or with a "
 "sane default."
 msgstr ""
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 78e869f..6540f59 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: 2012-04-08 11:41+0300\n"
+"POT-Creation-Date: 2012-04-08 12:28+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"
@@ -567,7 +567,7 @@ msgid ""
 "home, respectively (see I<live-snapshot>(1) for more information). The order "
 "these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay image "
 "files and snapshot archive files have extensions which determines their "
-"filesystem or archive type, e.g. \"custom-ov.ext3\" and \"\\home-sn.squashfs"
+"filesystem or archive type, e.g. \"custom-ov.ext4\" and \"\\home-sn.squashfs"
 "\"."
 msgstr ""
 
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index 210ba48..133bd0c 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: 2012-04-08 11:41+0300\n"
+"POT-Creation-Date: 2012-04-08 12:28+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"
@@ -240,7 +240,7 @@ msgstr ""
 msgid ""
 "specifies the input directory to be cloned in the image file. Its default "
 "value \"/live/cow\" should be right for most uses. However it could be handy "
-"to specify \"/home\" and type ext2 for the type to prepare an image file "
+"to specify \"/home\" and type ext4 for the type to prepare an image file "
 "suited to be directly mounted by live-boot as home."
 msgstr ""
 
@@ -256,7 +256,7 @@ msgid ""
 "sets the device where the media which the snapshot/persistence file/"
 "partition will be put. If it is not specified, a tmpfs will be used and "
 "linked to the user's desktop to move it where it is needed. If the device "
-"has no filesystem, an ext2 fs will be automatically created and labelled "
+"has no filesystem, an ext4 fs will be automatically created and labelled "
 "according to the values specified after the \"--output\" value or with a "
 "sane default."
 msgstr ""

-- 
live-boot

