summaryrefslogtreecommitdiff
path: root/manpages/en
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-06-06 19:02:00 +0200
committerDaniel Baumann <daniel@debian.org>2012-06-06 19:02:04 +0200
commit59a83cb48cd1c0f602be3927d8f746b599c4dafe (patch)
tree2cb9f347b9b2d74546cd99aeed489c52ea47ecb7 /manpages/en
parente243babf191d5b42efe58e90e74a22bd8063be8d (diff)
downloadlive-boot-59a83cb48cd1c0f602be3927d8f746b599c4dafe.tar.gz
live-boot-59a83cb48cd1c0f602be3927d8f746b599c4dafe.zip
Setting persistence label for live-* 3.x persistency to 'persistence', we're not making any difference between full-ov and custom-ov anymore on the filesystem and partition label (it's determined by the contents of live-persistence.conf).
Diffstat (limited to 'manpages/en')
-rw-r--r--manpages/en/live-boot.72
-rw-r--r--manpages/en/live-persistence.conf.56
2 files changed, 4 insertions, 4 deletions
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 516b189..4f25b61 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -109,7 +109,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 "\fBpersistence\fR" 4
-live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image 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-persistence.conf\fR(5)). The order these are handled are: full\-ov, custom\-ov. Overlay image files have extensions which determines their filesystem, e.g. "custom\-ov.ext4".
+live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" (see \fIlive-persistence.conf\fR(5)). Overlay image files have extensions which determines their filesystem, e.g. "persistence.ext4".
.IP "\fBpersistence\-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 persistence 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 "\fBpersistence\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4
diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5
index 194826d..eddb8be 100644
--- a/manpages/en/live-persistence.conf.5
+++ b/manpages/en/live-persistence.conf.5
@@ -6,7 +6,7 @@ live\-boot
.SH DESCRIPTION
If live-boot probes a persistence volume with the label (or GPT name,
-or file name, but from now on we will just say "label") "custom\-ov",
+or file name, but from now on we will just say "label") "persistence",
that volume's persistence is fully customizable through the
\fBlive-persistence.conf\fR file stored on the root of its file system. Any such
labeled volume must have such a file, or it will be ignored.
@@ -24,8 +24,8 @@ described by the list of \fIOPTION\fRs".
.PP
For each custom mount \fIDIR\fR must be an absolute path that cannot
contain white spaces or the special . and .. path components, and
-cannot be /live (or any of its sub-directories), or / (for the latter,
-use "full-ov" persistence instead). Once activated all changes (file
+cannot be /live (or any of its sub-directories).
+Once activated all changes (file
deletion, creation and modification) to \fIDIR\fR on the live file
system are stored persistently into a path equivalent to \fIDIR\fR on
the persistence media, called the source directory. The default way to