[SCM] live-boot branch, tmp-persistent, updated. debian/3.0_a26-1-9-g4e54d60
Daniel Baumann
daniel at debian.org
Sun Apr 8 16:30:43 UTC 2012
The following commit has been merged in the tmp-persistent branch:
commit 4e54d60d7f69ae3441e519e5611bd7ea48a8be19
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Apr 8 18:29:45 2012 +0200
Using 'persistence' (noun) rather than 'persistent' (adjective/adverb) everywhere.
diff --git a/bin/live-snapshot b/bin/live-snapshot
index c9de008..6ba45f2 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -517,9 +517,9 @@ Warn_user ()
;;
esac
- if grep -qv persistent /proc/cmdline
+ if grep -qv persistence /proc/cmdline
then
- echo "Remember to boot this live system with \"persistent\" specified at boot prompt." > /dev/null 1>&2
+ echo "Remember to boot this live system with \"persistence\" specified at boot prompt." > /dev/null 1>&2
fi
fi
}
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 3268b42..85cd150 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -157,9 +157,9 @@ 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 be checked at boot time, use this parameter, otherwise they are
skipped.
-.IP \fBnopersistent\fP 4
-disables the "persistent" feature, useful if the bootloader (like syslinux)
-has been installed with persistent enabled.
+.IP \fBnopersistence\fP 4
+disables the "persistence" feature, useful if the bootloader (like syslinux)
+has been installed with persistence enabled.
.IP \fBnoprompt\fP 4
Do not prompt to eject the CD or remove the USB flash drive on reboot.
.IP \fBnoprompt\fP=\fITYPE\fP 4
@@ -172,8 +172,8 @@ 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 4
-live\-boot will probe devices for persistent media. These can be partitions
+.IP \fBpersistence\fP 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/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
@@ -183,42 +183,42 @@ 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.ext4" and "\home\-sn.squashfs".
-.IP "\fBpersistent\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+.IP "\fBpersistence\-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
+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 \fBpersistent\-media\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4
+.IP \fBpersistence\-media\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4
If you specify the keyword 'removable', live\-boot will try to find
-persistent and snapshot partitions on removable media only. Note that if you
-want to further restrict the media to usb mass storage only, you can use the
-\&'removable\-usb' keyword.
-.IP "\fBpersistent\-method\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
-This option determines which types of persistent media we allow. If
+persistence and snapshot partitions on removable media only. Note that if
+you want to further restrict the media to usb mass storage only, you can use
+the 'removable\-usb' keyword.
+.IP "\fBpersistence\-method\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+This option determines which types of persistence media we allow. If
"overlay" is in the list, we consider overlays (i.e. "live\-rw" and
"home\-rw"); if "snapshot" is in the list, we consider snapshots
(i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot".
-.IP \fBpersistent\-path\fP=\fIPATH\fP 4
+.IP \fBpersistence\-path\fP=\fIPATH\fP 4
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
have multiple directories on the same partition to store persistency files.
-.IP \fBpersistent\-read\-only\fP 4
-Filesystem changes are not saved back to persistent media. In particular,
+.IP \fBpersistence\-read\-only\fP 4
+Filesystem changes are not saved back to persistence media. In particular,
overlays and netboot NFS mounts are mounted read\-only, and snapshots are not
resynced on shutdown.
-.IP "\fBpersistent\-storage\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
-This option determines which types of persistent storage to consider when
-probing for persistent media. If "filesystem" is in the list, filesystems
+.IP "\fBpersistence\-storage\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+This option determines which types of persistence storage to consider when
+probing for persistence media. If "filesystem" is in the list, filesystems
with matching labels will be used; if "file" is in the list, all filesystems
will be probed for archives and image files with matching filenames. The
default is "file,filesystem".
-.IP \fBpersistent\-subtext\fP=\fISUFFIX\fP 4
+.IP \fBpersistence\-subtext\fP=\fISUFFIX\fP 4
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
+use for the above mentioned persistence feature, the SUFFIX will be added
after a dash (e.g.: "live\-sn" would transform to "live\-sn\-SUFFIX"). This is
handy to test multiple live\-boot based live\-systems with different
-persistent storage choices.
+persistence storage choices.
.IP \fBquickreboot\fP 4
This option causes live\-boot to reboot without attempting to eject the media
and without asking the user to remove the boot media.
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 3661451..72ca829 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -22,8 +22,9 @@
.SH DESCRIPTION
live\-snapshot is a script which can be used to build the right types of
-persistent image files supported by \fIlive\-boot\fP(7). It is also used on exit
-by the live\-boot init script to resync the boot\-found snapshots devices.
+persistence image files supported by \fIlive\-boot\fP(7). It is also used on
+exit by the live\-boot init script to resync the boot\-found snapshots
+devices.
.SH OPTIONS
.IP "\-c, \-\-cow \fIDIRECTORY\fP" 4
diff --git a/manpages/de/live.persist.5.de.persist b/manpages/de/live.persist.5.de.persist
index 91e1213..e7a09f9 100644
--- a/manpages/de/live.persist.5.de.persist
+++ b/manpages/de/live.persist.5.de.persist
@@ -6,14 +6,14 @@
.TH LIVE\-BOOT persist 2012\-04\-08 3.0~a26\-1 "Debian Live Project"
.SH NAME
-\fBlive.persist\fP \- Configuration file for persistent media in live\-boot
+\fBlive.persist\fP \- Configuration file for persistence media in live\-boot
.SH DESCRIPTION
-If live\-boot probes a persistent volume with the label (or GPT name, or file
-name, but from now on we will just say "label") "custom\-ov", that volume's
-persistence is fully customizable through the \fBlive.persist\fP file stored on
-the root of its file system. Any such labeled volume must have such a file,
-or it will be ignored.
+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", that
+volume's persistence is fully customizable through the \fBlive.persist\fP file
+stored on the root of its file system. Any such labeled volume must have
+such a file, or it will be ignored.
.PP
The format of \fBlive.persist\fP allow empty lines and lines starting with a
"#" (used for comments), both which will be ignored. A so called "custom
@@ -23,7 +23,7 @@ mount" has the format:
\fIDIR\fP [\fIOPTION\fP]...
.RE
.PP
-which roughly translates to "make \fIDIR\fP persistent in the way described by
+which roughly translates to "make \fIDIR\fP persistence in the way described by
the list of \fIOPTION\fPs".
.PP
For each custom mount \fIDIR\fP must be an absolute path that cannot contain
@@ -31,7 +31,7 @@ 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 deletion, creation
and modification) to \fIDIR\fP on the live file system are stored persistently
-into a path equivalent to \fIDIR\fP on the persistent media, called the source
+into a path equivalent to \fIDIR\fP on the persistence media, called the source
directory. The default way to achieve persistence is to simply bind\-mount
the corresponding source directory to \fIDIR\fP, but this can be changed
through the use of \fIOPTION\fPs.
@@ -40,7 +40,7 @@ All custom mounts will be done in an order so that no two custom mounts can
"hide" each other. For instance, if we have the two \fIDIR\fP:s /a and /a/b it
would always be the case that /a is mounted first, then /a/b. This remains
true no matter how the lines in \fBlive.persist\fP are ordered, or if several
-\fBlive.persist\fP files on different persistent media are used at the same
+\fBlive.persist\fP files on different persistence media are used at the same
time. However, it is forbidden for custom mounts to have their source
directory inside the source directory of another custom mount, so the source
directories that are auto\-created by live\-boot does not support "nested"
@@ -48,21 +48,21 @@ mounts like /a and /a/b on the same media. In this case you must use the
\fBsource\fP option (see below) to make sure that they are stored in different
source directories.
.PP
-When a source directory doesn't exist on the persistent media for a certain
+When a source directory doesn't exist on the persistence media for a certain
custom mount, it will be created automatically, and permissions and
ownership will be optimistically set according to \fIDIR\fP. It will also be
bootstrapped by copying the contents of the \fIDIR\fP into its source directory
-on the persistent media. The bootstrapping will not happen when the
+on the persistence media. The bootstrapping will not happen when the
\fBlinkfiles\fP or \fBunion\fP options are used (see below).
.SH OPTIONS
Custom mounts defined in \fBlive.persist\fP accept the following options in a
coma\-separated list:
.IP \fBsource\fP=\fIPATH\fP 4
-When given, store the persistent changes into \fIPATH\fP on the persistent
-media. \fIPATH\fP must be a relative path (w.r.t. the persistent media root)
+When given, store the persistence changes into \fIPATH\fP on the persistence
+media. \fIPATH\fP must be a relative path (w.r.t. the persistence media root)
that cannot contain white spaces or the special . or .. path components,
-with the exception that it can be just . which means the persistent media
+with the exception that it can be just . which means the persistence media
root. This option is mostly relevant if you want to nest custom mounts,
which otherwise would cause errors, or if you want to make the whole media
root available (similar to the now deprecated \fBhome\-rw\fP type of
@@ -73,7 +73,7 @@ be in effect):
.IP \fBbind\fP 4
Bind\-mount the source directory to \fIDIR\fP. This is the default.
.IP \fBlinkfiles\fP 4
-Create the directory structure of the source directory on the persistent
+Create the directory structure of the source directory on the persistence
media in \fIDIR\fP and create symbolic links from the corresponding place in
\fIDIR\fP to each file in the source directory. Existing files or directories
with the same name as any link will be overwritten. Note that deleting the
@@ -89,7 +89,7 @@ useful when only certain files need to be persistent, not the whole
directory they're in, e.g. some configuration files in a user's home
directory.
.IP \fBunion\fP 4
-Save the rw branch of a union on the persistent media, so only the changes
+Save the rw branch of a union on the persistence media, so only the changes
are stored persistently. This can potentially reduce disk usage compared to
bind\-mounts, and will not hide files added to the read\-only media. One
caveat is that the union will use \fIDIR\fP from the image's read\-only file
@@ -99,16 +99,16 @@ file system specified by live\-boot's \fBunion\fP boot parameter, but is not
supported with \fBunion=unionmount\fP.
.SH DIRECTORIES
-.IP \fB/live/persistent\fP 4
-All persistent volumes will be mounted here (in a directory corresponding to
-the device name). The \fBlive.persist\fP file can easily be edited through this
-mount, as well as any source directories (which is especially practical for
-custom mounts using the \fBlinkfiles\fP option).
+.IP \fB/live/persistence\fP 4
+All persistence volumes will be mounted here (in a directory corresponding
+to the device name). The \fBlive.persist\fP file can easily be edited through
+this mount, as well as any source directories (which is especially practical
+for custom mounts using the \fBlinkfiles\fP option).
.SH EXAMPLES
-Let's say we have a persistent volume \fIVOL\fP with the a \fBlive.persist\fP file
-containing the following four lines (numbered for ease of reference):
+Let's say we have a persistence volume \fIVOL\fP with the a \fBlive.persist\fP
+file containing the following four lines (numbered for ease of reference):
.TP 7
1.
/home/user1 linkfiles,source=config\-files/user1
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 32f1108..8ac8394 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -96,8 +96,8 @@ This tells live\-boot to perform a network mount. The parameter "nfsroot=" (with
This lets you specify custom nfs options.
.IP "\fBnofastboot\fR" 4
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 be checked at boot time, use this parameter, otherwise they are skipped.
-.IP "\fBnopersistent\fR" 4
-disables the "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
+.IP "\fBnopersistence\fR" 4
+disables the "persistence" feature, useful if the bootloader (like syslinux) has been installed with persistence enabled.
.IP "\fBnoprompt\fR" 4
Do not prompt to eject the CD or remove the USB flash drive on reboot.
.IP "\fBnoprompt\fR=\fITYPE\fR" 4
@@ -106,22 +106,22 @@ This tells live-boot not to prompt to eject the CD (when noprompt=cd) or remove
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" 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.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
-If you specify the keyword 'removable', live\-boot will try to find persistent and snapshot partitions on removable media only. Note that if you want to further restrict the media to usb mass storage only, you can use the 'removable\-usb' keyword.
-.IP "\fBpersistent\-method\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
-This option determines which types of persistent media we allow. If "overlay" is in the list, we consider overlays (i.e. "live\-rw" and "home\-rw"); if "snapshot" is in the list, we consider snapshots (i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot".
-.IP "\fBpersistent\-path\fR=\fIPATH\fR" 4
+.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/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 "\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
+If you specify the keyword 'removable', live\-boot will try to find persistence and snapshot partitions on removable media only. Note that if you want to further restrict the media to usb mass storage only, you can use the 'removable\-usb' keyword.
+.IP "\fBpersistence\-method\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
+This option determines which types of persistence media we allow. If "overlay" is in the list, we consider overlays (i.e. "live\-rw" and "home\-rw"); if "snapshot" is in the list, we consider snapshots (i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot".
+.IP "\fBpersistence\-path\fR=\fIPATH\fR" 4
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 have multiple directories on the same partition to store persistency files.
-.IP "\fBpersistent\-read\-only\fR" 4
-Filesystem changes are not saved back to persistent media. In particular, overlays and netboot NFS mounts are mounted read-only, and snapshots are not resynced on shutdown.
-.IP "\fBpersistent\-storage\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
-This option determines which types of persistent storage to consider when probing for persistent media. If "filesystem" is in the list, filesystems with matching labels will be used; if "file" is in the list, all filesystems will be probed for archives and image files with matching filenames. The default is "file,filesystem".
-.IP "\fBpersistent\-subtext\fR=\fISUFFIX\fR" 4
-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 after a dash (e.g.: "live-sn" would transform to "live-sn-SUFFIX"). This is handy to test multiple live-boot based live-systems with different persistent storage choices.
+.IP "\fBpersistence\-read\-only\fR" 4
+Filesystem changes are not saved back to persistence media. In particular, overlays and netboot NFS mounts are mounted read-only, and snapshots are not resynced on shutdown.
+.IP "\fBpersistence\-storage\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
+This option determines which types of persistence storage to consider when probing for persistence media. If "filesystem" is in the list, filesystems with matching labels will be used; if "file" is in the list, all filesystems will be probed for archives and image files with matching filenames. The default is "file,filesystem".
+.IP "\fBpersistence\-subtext\fR=\fISUFFIX\fR" 4
+Add a suffix when searching for the image filenames or partition labels to use for the above mentioned persistence feature, the SUFFIX will be added after a dash (e.g.: "live-sn" would transform to "live-sn-SUFFIX"). This is handy to test multiple live-boot based live-systems with different persistence storage choices.
.IP "\fBquickreboot\fR" 4
This option causes live\-boot to reboot without attempting to eject the media and without asking the user to remove the boot media.
.IP "\fBshowmounts\fR" 4
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index cefa015..2587c56 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -15,7 +15,7 @@
\fBlive\-snapshot\fR [\-v|\-\-version]
.SH DESCRIPTION
-live\-snapshot is a script which can be used to build the right types of persistent image files supported by \fIlive\-boot\fR(7). It is also used on exit by the live\-boot init script to resync the boot\-found snapshots devices.
+live\-snapshot is a script which can be used to build the right types of persistence image files supported by \fIlive\-boot\fR(7). It is also used on exit by the live\-boot init script to resync the boot\-found snapshots devices.
.SH OPTIONS
.IP "\-c, \-\-cow \fIDIRECTORY\fR" 4
diff --git a/manpages/en/live.persist.5 b/manpages/en/live.persist.5
index e7a87c5..94d6e6b 100644
--- a/manpages/en/live.persist.5
+++ b/manpages/en/live.persist.5
@@ -1,11 +1,11 @@
.TH LIVE\-BOOT persist 2012\-04\-08 3.0~a26-1 "Debian Live Project"
.SH NAME
-\fBlive.persist\fR \- Configuration file for persistent media in
+\fBlive.persist\fR \- Configuration file for persistence media in
live\-boot
.SH DESCRIPTION
-If live-boot probes a persistent volume with the label (or GPT name,
+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",
that volume's persistence is fully customizable through the
\fBlive.persist\fR file stored on the root of its file system. Any such
@@ -19,7 +19,7 @@ called "custom mount" has the format:
\fIDIR\fR [\fIOPTION\fR]...
.RE
.PP
-which roughly translates to "make \fIDIR\fR persistent in the way
+which roughly translates to "make \fIDIR\fR persistence in the way
described by the list of \fIOPTION\fRs".
.PP
For each custom mount \fIDIR\fR must be an absolute path that cannot
@@ -28,7 +28,7 @@ cannot be /live (or any of its sub-directories), or / (for the latter,
use "full-ov" persistence instead). 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 persistent media, called the source directory. The default way to
+the persistence media, called the source directory. The default way to
achieve persistence is to simply bind-mount the corresponding source
directory to \fIDIR\fR, but this can be changed through the use of
\fIOPTION\fRs.
@@ -38,7 +38,7 @@ mounts can "hide" each other. For instance, if we have the two
\fIDIR\fR:s /a and /a/b it would always be the case that /a is mounted
first, then /a/b. This remains true no matter how the lines in
\fBlive.persist\fR are ordered, or if several \fBlive.persist\fR files
-on different persistent media are used at the same time. However, it
+on different persistence media are used at the same time. However, it
is forbidden for custom mounts to have their source directory inside
the source directory of another custom mount, so the source
directories that are auto-created by live-boot does not support
@@ -46,11 +46,11 @@ directories that are auto-created by live-boot does not support
must use the \fBsource\fR option (see below) to make sure that they
are stored in different source directories.
.PP
-When a source directory doesn't exist on the persistent media for a
+When a source directory doesn't exist on the persistence media for a
certain custom mount, it will be created automatically, and
permissions and ownership will be optimistically set according to
\fIDIR\fR. It will also be bootstrapped by copying the contents of the
-\fIDIR\fR into its source directory on the persistent media. The
+\fIDIR\fR into its source directory on the persistence media. The
bootstrapping will not happen when the \fBlinkfiles\fR or \fBunion\fR
options are used (see below).
@@ -58,11 +58,11 @@ options are used (see below).
Custom mounts defined in \fBlive.persist\fR accept the following
options in a coma-separated list:
.IP "\fBsource\fR=\fIPATH\fR" 4
-When given, store the persistent changes into \fIPATH\fR on the
-persistent media. \fIPATH\fR must be a relative path (w.r.t. the
-persistent media root) that cannot contain white spaces or the
+When given, store the persistence changes into \fIPATH\fR on the
+persistence media. \fIPATH\fR must be a relative path (w.r.t. the
+persistence media root) that cannot contain white spaces or the
special . or .. path components, with the exception that it can be
-just . which means the persistent media root. This option is mostly
+just . which means the persistence media root. This option is mostly
relevant if you want to nest custom mounts, which otherwise would
cause errors, or if you want to make the whole media root available
(similar to the now deprecated \fBhome-rw\fR type of persistence).
@@ -73,7 +73,7 @@ will be in effect):
Bind-mount the source directory to \fIDIR\fR. This is the default.
.IP "\fBlinkfiles\fR" 4
Create the directory structure of the source directory on the
-persistent media in \fIDIR\fR and create symbolic links from the
+persistence media in \fIDIR\fR and create symbolic links from the
corresponding place in \fIDIR\fR to each file in the source directory.
Existing files or directories with the same name as any link will be
overwritten. Note that deleting the links in \fIDIR\fR will only
@@ -89,7 +89,7 @@ there. This option is useful when only certain files need to be
persistent, not the whole directory they're in, e.g. some
configuration files in a user's home directory.
.IP "\fBunion\fR" 4
-Save the rw branch of a union on the persistent media, so only the
+Save the rw branch of a union on the persistence media, so only the
changes are stored persistently. This can potentially reduce disk
usage compared to bind-mounts, and will not hide files added to the
read-only media. One caveat is that the union will use \fIDIR\fR from
@@ -100,8 +100,8 @@ live-boot's \fBunion\fR boot parameter, but is not supported with
\fBunion=unionmount\fR.
.SH DIRECTORIES
-.IP "\fB/live/persistent\fR" 4
-All persistent volumes will be mounted here (in a directory
+.IP "\fB/live/persistence\fR" 4
+All persistence volumes will be mounted here (in a directory
corresponding to the device name). The \fBlive.persist\fR file can
easily be edited through this mount, as well as any source directories
(which is especially practical for custom mounts using the
@@ -109,7 +109,7 @@ easily be edited through this mount, as well as any source directories
.SH EXAMPLES
-Let's say we have a persistent volume \fIVOL\fR with the a
+Let's say we have a persistence volume \fIVOL\fR with the a
\fBlive.persist\fR file containing the following four lines (numbered
for ease of reference):
.TP 7
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index bcb449e..387691c 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 18:00+0300\n"
+"POT-Creation-Date: 2012-04-08 18:23+0300\n"
"PO-Revision-Date: 2012-04-05 08:11+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -488,14 +488,14 @@ msgstr ""
#. type: IP
#: en/live-boot.7:99
#, no-wrap
-msgid "B<nopersistent>"
+msgid "B<nopersistence>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:101
msgid ""
-"disables the \"persistent\" feature, useful if the bootloader (like "
-"syslinux) has been installed with persistent enabled."
+"disables the \"persistence\" feature, useful if the bootloader (like "
+"syslinux) has been installed with persistence enabled."
msgstr ""
#. type: IP
@@ -551,13 +551,13 @@ msgstr ""
#. type: IP
#: en/live-boot.7:109
#, no-wrap
-msgid "B<persistent>"
+msgid "B<persistence>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:111
msgid ""
-"live-boot will probe devices for persistent media. These can be partitions "
+"live-boot will probe devices for persistence 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 "
@@ -573,14 +573,14 @@ msgstr ""
#. type: IP
#: en/live-boot.7:111
#, no-wrap
-msgid "B<persistent-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:113
msgid ""
"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 "
+"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\"."
@@ -589,37 +589,37 @@ msgstr ""
#. type: IP
#: en/live-boot.7:113
#, no-wrap
-msgid "B<persistent-media>={I<removable>|I<removable-usb>}"
+msgid "B<persistence-media>={I<removable>|I<removable-usb>}"
msgstr ""
#. type: Plain text
#: en/live-boot.7:115
msgid ""
"If you specify the keyword 'removable', live-boot will try to find "
-"persistent and snapshot partitions on removable media only. Note that if you "
-"want to further restrict the media to usb mass storage only, you can use the "
-"'removable-usb' keyword."
+"persistence and snapshot partitions on removable media only. Note that if "
+"you want to further restrict the media to usb mass storage only, you can use "
+"the 'removable-usb' keyword."
msgstr ""
#. type: IP
#: en/live-boot.7:115
#, no-wrap
-msgid "B<persistent-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:117
msgid ""
-"This option determines which types of persistent media we allow. If \"overlay"
-"\" is in the list, we consider overlays (i.e. \"live-rw\" and \"home-rw\"); "
-"if \"snapshot\" is in the list, we consider snapshots (i.e. \"live-sn\" and "
-"\"home-sn\"). The default is \"overlay,snapshot\"."
+"This option determines which types of persistence media we allow. If "
+"\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and "
+"\"home-rw\"); if \"snapshot\" is in the list, we consider snapshots (i.e. "
+"\"live-sn\" and \"home-sn\"). The default is \"overlay,snapshot\"."
msgstr ""
#. type: IP
#: en/live-boot.7:117
#, no-wrap
-msgid "B<persistent-path>=I<PATH>"
+msgid "B<persistence-path>=I<PATH>"
msgstr ""
#. type: Plain text
@@ -633,13 +633,13 @@ msgstr ""
#. type: IP
#: en/live-boot.7:119
#, no-wrap
-msgid "B<persistent-read-only>"
+msgid "B<persistence-read-only>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:121
msgid ""
-"Filesystem changes are not saved back to persistent media. In particular, "
+"Filesystem changes are not saved back to persistence media. In particular, "
"overlays and netboot NFS mounts are mounted read-only, and snapshots are not "
"resynced on shutdown."
msgstr ""
@@ -647,14 +647,14 @@ msgstr ""
#. type: IP
#: en/live-boot.7:121
#, no-wrap
-msgid "B<persistent-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:123
msgid ""
-"This option determines which types of persistent storage to consider when "
-"probing for persistent media. If \"filesystem\" is in the list, filesystems "
+"This option determines which types of persistence storage to consider when "
+"probing for persistence media. If \"filesystem\" is in the list, filesystems "
"with matching labels will be used; if \"file\" is in the list, all "
"filesystems will be probed for archives and image files with matching "
"filenames. The default is \"file,filesystem\"."
@@ -663,17 +663,17 @@ msgstr ""
#. type: IP
#: en/live-boot.7:123
#, no-wrap
-msgid "B<persistent-subtext>=I<SUFFIX>"
+msgid "B<persistence-subtext>=I<SUFFIX>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:125
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 "
+"use for the above mentioned persistence feature, the SUFFIX will be added "
"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This "
"is handy to test multiple live-boot based live-systems with different "
-"persistent storage choices."
+"persistence storage choices."
msgstr ""
#. type: IP
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 381699d..de93987 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 18:00+0300\n"
+"POT-Creation-Date: 2012-04-08 18:23+0300\n"
"PO-Revision-Date: 2012-04-05 08:11+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -224,8 +224,8 @@ msgstr ""
#: en/live-snapshot.1:19
msgid ""
"live-snapshot is a script which can be used to build the right types of "
-"persistent image files supported by I<live-boot>(7). It is also used on exit "
-"by the live-boot init script to resync the boot-found snapshots devices."
+"persistence image files supported by I<live-boot>(7). It is also used on "
+"exit by the live-boot init script to resync the boot-found snapshots devices."
msgstr ""
#. type: IP
diff --git a/manpages/po/de/live.persist.5.po b/manpages/po/de/live.persist.5.po
index dd3ac7b..7ffa3d2 100644
--- a/manpages/po/de/live.persist.5.po
+++ b/manpages/po/de/live.persist.5.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 18:23+0300\n"
"PO-Revision-Date: 2012-04-05 08:11+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -115,14 +115,14 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:6
-msgid "B<live.persist> - Configuration file for persistent media in live-boot"
+msgid "B<live.persist> - Configuration file for persistence media in live-boot"
msgstr ""
#. type: Plain text
#: en/live.persist.5:13
msgid ""
-"If live-boot probes a persistent volume with the label (or GPT name, or file "
-"name, but from now on we will just say \"label\") \"custom-ov\", that "
+"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\", that "
"volume's persistence is fully customizable through the B<live.persist> file "
"stored on the root of its file system. Any such labeled volume must have "
"such a file, or it will be ignored."
@@ -144,8 +144,8 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:24
msgid ""
-"which roughly translates to \"make I<DIR> persistent in the way described by "
-"the list of I<OPTION>s\"."
+"which roughly translates to \"make I<DIR> persistence in the way described "
+"by the list of I<OPTION>s\"."
msgstr ""
#. type: Plain text
@@ -156,7 +156,7 @@ msgid ""
"(or any of its sub-directories), or / (for the latter, use \"full-ov\" "
"persistence instead). Once activated all changes (file deletion, creation "
"and modification) to I<DIR> on the live file system are stored persistently "
-"into a path equivalent to I<DIR> on the persistent media, called the source "
+"into a path equivalent to I<DIR> on the persistence media, called the source "
"directory. The default way to achieve persistence is to simply bind-mount "
"the corresponding source directory to I<DIR>, but this can be changed "
"through the use of I<OPTION>s."
@@ -169,7 +169,7 @@ msgid ""
"\"hide\" each other. For instance, if we have the two I<DIR>:s /a and /a/b "
"it would always be the case that /a is mounted first, then /a/b. This "
"remains true no matter how the lines in B<live.persist> are ordered, or if "
-"several B<live.persist> files on different persistent media are used at the "
+"several B<live.persist> files on different persistence media are used at the "
"same time. However, it is forbidden for custom mounts to have their source "
"directory inside the source directory of another custom mount, so the source "
"directories that are auto-created by live-boot does not support \"nested\" "
@@ -181,11 +181,11 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:56
msgid ""
-"When a source directory doesn't exist on the persistent media for a certain "
+"When a source directory doesn't exist on the persistence media for a certain "
"custom mount, it will be created automatically, and permissions and "
"ownership will be optimistically set according to I<DIR>. It will also be "
"bootstrapped by copying the contents of the I<DIR> into its source directory "
-"on the persistent media. The bootstrapping will not happen when the "
+"on the persistence media. The bootstrapping will not happen when the "
"B<linkfiles> or B<union> options are used (see below)."
msgstr ""
@@ -205,10 +205,10 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:69
msgid ""
-"When given, store the persistent changes into I<PATH> on the persistent "
-"media. I<PATH> must be a relative path (w.r.t. the persistent media root) "
+"When given, store the persistence changes into I<PATH> on the persistence "
+"media. I<PATH> must be a relative path (w.r.t. the persistence media root) "
"that cannot contain white spaces or the special . or .. path components, "
-"with the exception that it can be just . which means the persistent media "
+"with the exception that it can be just . which means the persistence media "
"root. This option is mostly relevant if you want to nest custom mounts, "
"which otherwise would cause errors, or if you want to make the whole media "
"root available (similar to the now deprecated B<home-rw> type of "
@@ -242,7 +242,7 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:83
msgid ""
-"Create the directory structure of the source directory on the persistent "
+"Create the directory structure of the source directory on the persistence "
"media in I<DIR> and create symbolic links from the corresponding place in "
"I<DIR> to each file in the source directory. Existing files or directories "
"with the same name as any link will be overwritten. Note that deleting the "
@@ -272,7 +272,7 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:101
msgid ""
-"Save the rw branch of a union on the persistent media, so only the changes "
+"Save the rw branch of a union on the persistence media, so only the changes "
"are stored persistently. This can potentially reduce disk usage compared to "
"bind-mounts, and will not hide files added to the read-only media. One "
"caveat is that the union will use I<DIR> from the image's read-only file "
@@ -291,16 +291,16 @@ msgstr ""
#. type: IP
#: en/live.persist.5:103
#, no-wrap
-msgid "B</live/persistent>"
+msgid "B</live/persistence>"
msgstr ""
#. type: Plain text
#: en/live.persist.5:109
msgid ""
-"All persistent volumes will be mounted here (in a directory corresponding to "
-"the device name). The B<live.persist> file can easily be edited through this "
-"mount, as well as any source directories (which is especially practical for "
-"custom mounts using the B<linkfiles> option)."
+"All persistence volumes will be mounted here (in a directory corresponding "
+"to the device name). The B<live.persist> file can easily be edited through "
+"this mount, as well as any source directories (which is especially practical "
+"for custom mounts using the B<linkfiles> option)."
msgstr ""
#. type: SH
@@ -312,8 +312,8 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:115
msgid ""
-"Let's say we have a persistent volume I<VOL> with the a B<live.persist> file "
-"containing the following four lines (numbered for ease of reference):"
+"Let's say we have a persistence volume I<VOL> with the a B<live.persist> "
+"file containing the following four lines (numbered for ease of reference):"
msgstr ""
#. type: TP
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 72a0795..0725784 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 18:00+0300\n"
+"POT-Creation-Date: 2012-04-08 18:23+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"
@@ -489,14 +489,14 @@ msgstr ""
#. type: IP
#: en/live-boot.7:99
#, no-wrap
-msgid "B<nopersistent>"
+msgid "B<nopersistence>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:101
msgid ""
-"disables the \"persistent\" feature, useful if the bootloader (like "
-"syslinux) has been installed with persistent enabled."
+"disables the \"persistence\" feature, useful if the bootloader (like "
+"syslinux) has been installed with persistence enabled."
msgstr ""
#. type: IP
@@ -552,13 +552,13 @@ msgstr ""
#. type: IP
#: en/live-boot.7:109
#, no-wrap
-msgid "B<persistent>"
+msgid "B<persistence>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:111
msgid ""
-"live-boot will probe devices for persistent media. These can be partitions "
+"live-boot will probe devices for persistence 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 "
@@ -574,14 +574,14 @@ msgstr ""
#. type: IP
#: en/live-boot.7:111
#, no-wrap
-msgid "B<persistent-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:113
msgid ""
"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 "
+"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\"."
@@ -590,37 +590,37 @@ msgstr ""
#. type: IP
#: en/live-boot.7:113
#, no-wrap
-msgid "B<persistent-media>={I<removable>|I<removable-usb>}"
+msgid "B<persistence-media>={I<removable>|I<removable-usb>}"
msgstr ""
#. type: Plain text
#: en/live-boot.7:115
msgid ""
"If you specify the keyword 'removable', live-boot will try to find "
-"persistent and snapshot partitions on removable media only. Note that if you "
-"want to further restrict the media to usb mass storage only, you can use the "
-"'removable-usb' keyword."
+"persistence and snapshot partitions on removable media only. Note that if "
+"you want to further restrict the media to usb mass storage only, you can use "
+"the 'removable-usb' keyword."
msgstr ""
#. type: IP
#: en/live-boot.7:115
#, no-wrap
-msgid "B<persistent-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:117
msgid ""
-"This option determines which types of persistent media we allow. If \"overlay"
-"\" is in the list, we consider overlays (i.e. \"live-rw\" and \"home-rw\"); "
-"if \"snapshot\" is in the list, we consider snapshots (i.e. \"live-sn\" and "
-"\"home-sn\"). The default is \"overlay,snapshot\"."
+"This option determines which types of persistence media we allow. If "
+"\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and "
+"\"home-rw\"); if \"snapshot\" is in the list, we consider snapshots (i.e. "
+"\"live-sn\" and \"home-sn\"). The default is \"overlay,snapshot\"."
msgstr ""
#. type: IP
#: en/live-boot.7:117
#, no-wrap
-msgid "B<persistent-path>=I<PATH>"
+msgid "B<persistence-path>=I<PATH>"
msgstr ""
#. type: Plain text
@@ -634,13 +634,13 @@ msgstr ""
#. type: IP
#: en/live-boot.7:119
#, no-wrap
-msgid "B<persistent-read-only>"
+msgid "B<persistence-read-only>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:121
msgid ""
-"Filesystem changes are not saved back to persistent media. In particular, "
+"Filesystem changes are not saved back to persistence media. In particular, "
"overlays and netboot NFS mounts are mounted read-only, and snapshots are not "
"resynced on shutdown."
msgstr ""
@@ -648,14 +648,14 @@ msgstr ""
#. type: IP
#: en/live-boot.7:121
#, no-wrap
-msgid "B<persistent-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:123
msgid ""
-"This option determines which types of persistent storage to consider when "
-"probing for persistent media. If \"filesystem\" is in the list, filesystems "
+"This option determines which types of persistence storage to consider when "
+"probing for persistence media. If \"filesystem\" is in the list, filesystems "
"with matching labels will be used; if \"file\" is in the list, all "
"filesystems will be probed for archives and image files with matching "
"filenames. The default is \"file,filesystem\"."
@@ -664,17 +664,17 @@ msgstr ""
#. type: IP
#: en/live-boot.7:123
#, no-wrap
-msgid "B<persistent-subtext>=I<SUFFIX>"
+msgid "B<persistence-subtext>=I<SUFFIX>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:125
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 "
+"use for the above mentioned persistence feature, the SUFFIX will be added "
"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This "
"is handy to test multiple live-boot based live-systems with different "
-"persistent storage choices."
+"persistence storage choices."
msgstr ""
#. type: IP
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index b9485be..69128de 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 18:00+0300\n"
+"POT-Creation-Date: 2012-04-08 18:23+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"
@@ -225,8 +225,8 @@ msgstr ""
#: en/live-snapshot.1:19
msgid ""
"live-snapshot is a script which can be used to build the right types of "
-"persistent image files supported by I<live-boot>(7). It is also used on exit "
-"by the live-boot init script to resync the boot-found snapshots devices."
+"persistence image files supported by I<live-boot>(7). It is also used on "
+"exit by the live-boot init script to resync the boot-found snapshots devices."
msgstr ""
#. type: IP
diff --git a/manpages/pot/live.persist.5.pot b/manpages/pot/live.persist.5.pot
index ca13b73..12e84b9 100644
--- a/manpages/pot/live.persist.5.pot
+++ b/manpages/pot/live.persist.5.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 18:23+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"
@@ -116,14 +116,14 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:6
-msgid "B<live.persist> - Configuration file for persistent media in live-boot"
+msgid "B<live.persist> - Configuration file for persistence media in live-boot"
msgstr ""
#. type: Plain text
#: en/live.persist.5:13
msgid ""
-"If live-boot probes a persistent volume with the label (or GPT name, or file "
-"name, but from now on we will just say \"label\") \"custom-ov\", that "
+"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\", that "
"volume's persistence is fully customizable through the B<live.persist> file "
"stored on the root of its file system. Any such labeled volume must have "
"such a file, or it will be ignored."
@@ -145,8 +145,8 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:24
msgid ""
-"which roughly translates to \"make I<DIR> persistent in the way described by "
-"the list of I<OPTION>s\"."
+"which roughly translates to \"make I<DIR> persistence in the way described "
+"by the list of I<OPTION>s\"."
msgstr ""
#. type: Plain text
@@ -157,7 +157,7 @@ msgid ""
"(or any of its sub-directories), or / (for the latter, use \"full-ov\" "
"persistence instead). Once activated all changes (file deletion, creation "
"and modification) to I<DIR> on the live file system are stored persistently "
-"into a path equivalent to I<DIR> on the persistent media, called the source "
+"into a path equivalent to I<DIR> on the persistence media, called the source "
"directory. The default way to achieve persistence is to simply bind-mount "
"the corresponding source directory to I<DIR>, but this can be changed "
"through the use of I<OPTION>s."
@@ -170,7 +170,7 @@ msgid ""
"\"hide\" each other. For instance, if we have the two I<DIR>:s /a and /a/b "
"it would always be the case that /a is mounted first, then /a/b. This "
"remains true no matter how the lines in B<live.persist> are ordered, or if "
-"several B<live.persist> files on different persistent media are used at the "
+"several B<live.persist> files on different persistence media are used at the "
"same time. However, it is forbidden for custom mounts to have their source "
"directory inside the source directory of another custom mount, so the source "
"directories that are auto-created by live-boot does not support \"nested\" "
@@ -182,11 +182,11 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:56
msgid ""
-"When a source directory doesn't exist on the persistent media for a certain "
+"When a source directory doesn't exist on the persistence media for a certain "
"custom mount, it will be created automatically, and permissions and "
"ownership will be optimistically set according to I<DIR>. It will also be "
"bootstrapped by copying the contents of the I<DIR> into its source directory "
-"on the persistent media. The bootstrapping will not happen when the "
+"on the persistence media. The bootstrapping will not happen when the "
"B<linkfiles> or B<union> options are used (see below)."
msgstr ""
@@ -206,10 +206,10 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:69
msgid ""
-"When given, store the persistent changes into I<PATH> on the persistent "
-"media. I<PATH> must be a relative path (w.r.t. the persistent media root) "
+"When given, store the persistence changes into I<PATH> on the persistence "
+"media. I<PATH> must be a relative path (w.r.t. the persistence media root) "
"that cannot contain white spaces or the special . or .. path components, "
-"with the exception that it can be just . which means the persistent media "
+"with the exception that it can be just . which means the persistence media "
"root. This option is mostly relevant if you want to nest custom mounts, "
"which otherwise would cause errors, or if you want to make the whole media "
"root available (similar to the now deprecated B<home-rw> type of "
@@ -243,7 +243,7 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:83
msgid ""
-"Create the directory structure of the source directory on the persistent "
+"Create the directory structure of the source directory on the persistence "
"media in I<DIR> and create symbolic links from the corresponding place in "
"I<DIR> to each file in the source directory. Existing files or directories "
"with the same name as any link will be overwritten. Note that deleting the "
@@ -273,7 +273,7 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:101
msgid ""
-"Save the rw branch of a union on the persistent media, so only the changes "
+"Save the rw branch of a union on the persistence media, so only the changes "
"are stored persistently. This can potentially reduce disk usage compared to "
"bind-mounts, and will not hide files added to the read-only media. One "
"caveat is that the union will use I<DIR> from the image's read-only file "
@@ -292,16 +292,16 @@ msgstr ""
#. type: IP
#: en/live.persist.5:103
#, no-wrap
-msgid "B</live/persistent>"
+msgid "B</live/persistence>"
msgstr ""
#. type: Plain text
#: en/live.persist.5:109
msgid ""
-"All persistent volumes will be mounted here (in a directory corresponding to "
-"the device name). The B<live.persist> file can easily be edited through this "
-"mount, as well as any source directories (which is especially practical for "
-"custom mounts using the B<linkfiles> option)."
+"All persistence volumes will be mounted here (in a directory corresponding "
+"to the device name). The B<live.persist> file can easily be edited through "
+"this mount, as well as any source directories (which is especially practical "
+"for custom mounts using the B<linkfiles> option)."
msgstr ""
#. type: SH
@@ -313,8 +313,8 @@ msgstr ""
#. type: Plain text
#: en/live.persist.5:115
msgid ""
-"Let's say we have a persistent volume I<VOL> with the a B<live.persist> file "
-"containing the following four lines (numbered for ease of reference):"
+"Let's say we have a persistence volume I<VOL> with the a B<live.persist> "
+"file containing the following four lines (numbered for ease of reference):"
msgstr ""
#. type: TP
diff --git a/scripts/live b/scripts/live
index 62f7df5..46407c1 100755
--- a/scripts/live
+++ b/scripts/live
@@ -799,7 +799,7 @@ try_snap ()
return 1
fi
- if [ -z ${PERSISTENT_READONLY} ]
+ if [ -z ${PERSISTENCE_READONLY} ]
then
echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt
fi
@@ -954,8 +954,8 @@ setup_unionfs ()
mkdir -p /overlay
- # Looking for persistent devices or files
- if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
+ # Looking for persistence devices or files
+ if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]
then
if [ -z "${QUICKUSBMODULES}" ]
@@ -985,7 +985,7 @@ setup_unionfs ()
done
fi
- case "${PERSISTENT_MEDIA}" in
+ case "${PERSISTENCE_MEDIA}" in
removable)
whitelistdev="$(removable_dev)"
;;
@@ -997,12 +997,12 @@ setup_unionfs ()
;;
esac
- if echo ${PERSISTENT_METHOD} | grep -qe "\<overlay\>"
+ if echo ${PERSISTENCE_METHOD} | grep -qe "\<overlay\>"
then
overlays="${root_overlay_label} ${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
fi
- if echo ${PERSISTENT_METHOD} | grep -qe "\<snapshot\>"
+ if echo ${PERSISTENCE_METHOD} | grep -qe "\<snapshot\>"
then
snapshots="${root_snapshot_label} ${home_snapshot_label}"
fi
@@ -1011,7 +1011,7 @@ setup_unionfs ()
local home_snapshot_label=""
local root_overlay_label=""
local overlay_devices=""
- for media in $(find_persistent_media "${overlays}" "${snapshots}" "${whitelistdev}")
+ for media in $(find_persistence_media "${overlays}" "${snapshots}" "${whitelistdev}")
do
media="$(echo ${media} | tr ":" " ")"
case ${media} in
@@ -1056,19 +1056,19 @@ setup_unionfs ()
cowdevice=${root_overlay_device}
cow_fstype=$(get_fstype "${root_overlay_device}")
- if [ -z "${PERSISTENT_READONLY}" ]
+ if [ -z "${PERSISTENCE_READONLY}" ]
then
cow_mountopt="rw,noatime"
else
cow_mountopt="ro,noatime"
fi
- if [ "${FORCEPERSISTENTFSCK}" = "Yes" ]
+ if [ "${FORCEPERSISTENCEFSCK}" = "Yes" ]
then
fsck -y ${cowdevice}
fi
fi
- elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ]
+ elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENCE}" ]
then
# check if there are any nfs options
if echo ${NFS_COW}|grep -q ','
@@ -1080,7 +1080,7 @@ setup_unionfs ()
nfs_cow=${NFS_COW}
fi
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
nfs_cow_opts="${nfs_cow_opts},nocto,ro"
fi
@@ -1104,10 +1104,10 @@ setup_unionfs ()
if [ "${UNIONTYPE}" != "unionmount" ]
then
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/overlay"
- root_backing="${rootmnt}/live/persistent/$(basename ${cowdevice})-root"
+ root_backing="${rootmnt}/live/persistence/$(basename ${cowdevice})-root"
mkdir -p ${root_backing}
else
root_backing="/overlay"
@@ -1160,14 +1160,14 @@ setup_unionfs ()
mkdir -p ${unionmountpoint}
if [ "${UNIONTYPE}" = "unionmount" ]
then
- # FIXME: handle PERSISTENT_READONLY
+ # FIXME: handle PERSISTENCE_READONLY
unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
mount_full $unionmountopts "${unionmountpoint}"
else
cow_dir="/overlay${dir}"
rofs_dir="${rofs}${dir}"
mkdir -p ${cow_dir}
- if [ -n "${PERSISTENT_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
+ if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
then
#mount -t tmpfs -o rw,noatime,mode=755 tmpfs "${cow_dir}"
do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rofs_dir}
@@ -1188,7 +1188,7 @@ setup_unionfs ()
live_rofs_list=""
# SHOWMOUNTS is necessary for custom mounts with the union option
# Since we may want to do custom mounts in user-space it's best to always enable SHOWMOUNTS
- if true #[ -n "${SHOWMOUNTS}" ] || ( [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] 1)
+ if true #[ -n "${SHOWMOUNTS}" ] || ( [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] 1)
then
# XXX: is the for loop really necessary? rofslist can only contain one item (see above XXX about EXPOSEDROOT) and this is also assumed elsewhere above (see use of $rofs above).
for d in ${rofslist}
@@ -1214,8 +1214,8 @@ setup_unionfs ()
done
fi
- # Adding custom persistent
- if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
+ # Adding custom persistence
+ if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]
then
local custom_mounts="/tmp/custom_mounts.list"
rm -rf ${custom_mounts} 2> /dev/null
@@ -1223,7 +1223,7 @@ setup_unionfs ()
# Gather information about custom mounts from devies detected as overlays
get_custom_mounts ${custom_mounts} ${overlay_devices}
- [ -n "${DEBUG}" ] && cp ${custom_mounts} "${rootmnt}/live/persistent"
+ [ -n "${DEBUG}" ] && cp ${custom_mounts} "${rootmnt}/live/persistence"
# Now we do the actual mounting (and symlinking)
local used_overlays=""
@@ -1235,7 +1235,7 @@ setup_unionfs ()
do
if echo ${used_overlays} | grep -qve "^\(.* \)\?${device}\( .*\)\?$"
then
- close_persistent_media ${overlay}
+ close_persistence_media ${overlay}
fi
done
diff --git a/scripts/live-bottom/08persistence_excludes b/scripts/live-bottom/08persistence_excludes
index 43639f9..633f6ac 100755
--- a/scripts/live-bottom/08persistence_excludes
+++ b/scripts/live-bottom/08persistence_excludes
@@ -26,7 +26,7 @@ esac
# live-boot header
-if [ -z "${PERSISTENT}" ] || [ -n "${NOPERSISTENT}" ] || [ -z "${PERSISTENCE_IS_ON}" ] || [ ! -f /root/etc/live-persistence.binds ]
+if [ -z "${PERSISTENCE}" ] || [ -n "${NOPERSISTENCE}" ] || [ -z "${PERSISTENCE_IS_ON}" ] || [ ! -f /root/etc/live-persistence.binds ]
then
exit 0
fi
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 9fea5a6..40058e9 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -89,9 +89,9 @@ Arguments ()
export FETCH
;;
- forcepersistentfsck)
- FORCEPERSISTENTFSCK="Yes"
- export FORCEPERSISTENTFSCK
+ forcepersistencefsck)
+ FORCEPERSISTENCEFSCK="Yes"
+ export FORCEPERSISTENCEFSCK
;;
ftpfs=*)
@@ -222,52 +222,52 @@ Arguments ()
export SWAPON
;;
- persistent)
- PERSISTENT="Yes"
- export PERSISTENT
+ persistence)
+ PERSISTENCE="Yes"
+ export PERSISTENCE
;;
- persistent-encryption=*)
- PERSISTENT_ENCRYPTION="${ARGUMENT#*=}"
- export PERSISTENT_ENCRYPTION
+ persistence-encryption=*)
+ PERSISTENCE_ENCRYPTION="${ARGUMENT#*=}"
+ export PERSISTENCE_ENCRYPTION
;;
- persistent-media=*)
- PERSISTENT_MEDIA="${ARGUMENT#*=}"
- export PERSISTENT_MEDIA
+ persistence-media=*)
+ PERSISTENCE_MEDIA="${ARGUMENT#*=}"
+ export PERSISTENCE_MEDIA
;;
- persistent-method=*)
- PERSISTENT_METHOD="${ARGUMENT#*=}"
- export PERSISTENT_METHOD
+ persistence-method=*)
+ PERSISTENCE_METHOD="${ARGUMENT#*=}"
+ export PERSISTENCE_METHOD
;;
- persistent-path=*)
- PERSISTENT_PATH="${ARGUMENT#persistent-path=}"
- export PERSISTENT_PATH
+ persistence-path=*)
+ PERSISTENCE_PATH="${ARGUMENT#persistence-path=}"
+ export PERSISTENCE_PATH
;;
- persistent-read-only)
- PERSISTENT_READONLY="Yes"
- export PERSISTENT_READONLY
+ persistence-read-only)
+ PERSISTENCE_READONLY="Yes"
+ export PERSISTENCE_READONLY
;;
- persistent-storage=*)
- PERSISTENT_STORAGE="${ARGUMENT#persistent-storage=}"
- export PERSISTENT_STORAGE
+ persistence-storage=*)
+ PERSISTENCE_STORAGE="${ARGUMENT#persistence-storage=}"
+ export PERSISTENCE_STORAGE
;;
- persistent-subtext=*)
- root_overlay_label="${root_overlay_label}-${ARGUMENT#persistent-subtext=}"
- old_root_overlay_label="${old_root_overlay_label}-${ARGUMENT#persistent-subtext=}"
- old_home_overlay_label="${old_home_overlay_label}-${ARGUMENT#persistent-subtext=}"
- custom_overlay_label="${custom_overlay_label}-${ARGUMENT#persistent-subtext=}"
- root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistent-subtext=}"
- old_root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistent-subtext=}"
- home_snapshot_label="${home_snapshot_label}-${ARGUMENT#persistent-subtext=}"
+ persistence-subtext=*)
+ root_overlay_label="${root_overlay_label}-${ARGUMENT#persistence-subtext=}"
+ old_root_overlay_label="${old_root_overlay_label}-${ARGUMENT#persistence-subtext=}"
+ old_home_overlay_label="${old_home_overlay_label}-${ARGUMENT#persistence-subtext=}"
+ custom_overlay_label="${custom_overlay_label}-${ARGUMENT#persistence-subtext=}"
+ root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistence-subtext=}"
+ old_root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistence-subtext=}"
+ home_snapshot_label="${home_snapshot_label}-${ARGUMENT#persistence-subtext=}"
;;
- nopersistent)
- NOPERSISTENT="Yes"
- export NOPERSISTENT
+ nopersistence)
+ NOPERSISTENCE="Yes"
+ export NOPERSISTENCE
;;
noprompt)
@@ -381,37 +381,37 @@ Arguments ()
export UNIONTYPE
fi
- if [ -z "${PERSISTENT_ENCRYPTION}" ]
+ if [ -z "${PERSISTENCE_ENCRYPTION}" ]
then
- PERSISTENT_ENCRYPTION="none"
- export PERSISTENT_ENCRYPTION
- elif echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>"
+ PERSISTENCE_ENCRYPTION="none"
+ export PERSISTENCE_ENCRYPTION
+ elif echo ${PERSISTENCE_ENCRYPTION} | grep -qe "\<luks\>"
then
if ! modprobe dm-crypt
then
log_warning_msg "Unable to load module dm-crypt"
- PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
- export PERSISTENT_ENCRYPTION
+ PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
+ export PERSISTENCE_ENCRYPTION
fi
if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
then
log_warning_msg "cryptsetup in unavailable"
- PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
- export PERSISTENT_ENCRYPTION
+ PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
+ export PERSISTENCE_ENCRYPTION
fi
fi
- if [ -z "${PERSISTENT_METHOD}" ]
+ if [ -z "${PERSISTENCE_METHOD}" ]
then
- PERSISTENT_METHOD="snapshot,overlay"
- export PERSISTENT_METHOD
+ PERSISTENCE_METHOD="snapshot,overlay"
+ export PERSISTENCE_METHOD
fi
- if [ -z "${PERSISTENT_STORAGE}" ]
+ if [ -z "${PERSISTENCE_STORAGE}" ]
then
- PERSISTENT_STORAGE="filesystem,file"
- export PERSISTENT_STORAGE
+ PERSISTENCE_STORAGE="filesystem,file"
+ export PERSISTENCE_STORAGE
fi
}
@@ -737,7 +737,7 @@ try_mount ()
fi
}
-mount_persistent_media ()
+mount_persistence_media ()
{
local device=${1}
local backing=""
@@ -748,7 +748,7 @@ mount_persistent_media ()
then
backing="/$(basename ${device})-backing"
else
- backing="${rootmnt}/live/persistent/$(basename ${device})"
+ backing="${rootmnt}/live/persistence/$(basename ${device})"
fi
mkdir -p "${backing}"
@@ -757,7 +757,7 @@ mount_persistent_media ()
then
local fstype="$(get_fstype ${device})"
local mount_opts="rw,noatime"
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
mount_opts="ro,noatime"
fi
@@ -766,7 +766,7 @@ mount_persistent_media ()
echo ${backing}
return 0
else
- log_warning_msg "Failed to mount persistent media ${device}"
+ log_warning_msg "Failed to mount persistence media ${device}"
return 1
fi
elif [ "${backing}" != "${old_backing}" ]
@@ -776,14 +776,14 @@ mount_persistent_media ()
echo ${backing}
return 0
else
- log_warning_msg "Failed to move persistent media ${device}"
+ log_warning_msg "Failed to move persistence media ${device}"
return 1
fi
fi
return 0
}
-close_persistent_media () {
+close_persistence_media () {
local device=${1}
local backing="$(where_is_mounted ${device})"
@@ -804,7 +804,7 @@ open_luks_device ()
dev="${1}"
name="$(basename ${dev})"
opts="--key-file=-"
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
opts="${opts} --readonly"
fi
@@ -912,7 +912,7 @@ probe_for_file_name ()
local dev="${3}"
local ret=""
- local backing="$(mount_persistent_media ${dev})"
+ local backing="$(mount_persistence_media ${dev})"
if [ -z "${backing}" ]
then
return
@@ -920,7 +920,7 @@ probe_for_file_name ()
for label in ${overlays}
do
- path=${backing}/${PERSISTENT_PATH}${label}
+ path=${backing}/${PERSISTENCE_PATH}${label}
if [ -f "${path}" ]
then
local loopdev=$(setup_loop "${path}" "loop" "/sys/block/loop*")
@@ -931,7 +931,7 @@ probe_for_file_name ()
do
for ext in squashfs cpio.gz ext2 ext3 ext4 jffs2
do
- path="${PERSISTENT_PATH}${label}.${ext}"
+ path="${PERSISTENCE_PATH}${label}.${ext}"
if [ -f "${backing}/${path}" ]
then
ret="${ret} ${label}=${dev}:${backing}:${path}"
@@ -947,7 +947,7 @@ probe_for_file_name ()
fi
}
-find_persistent_media ()
+find_persistence_media ()
{
# Scans devices for overlays and snapshots, and returns a whitespace
# separated list of how to use them. Only overlays with a partition
@@ -955,7 +955,7 @@ find_persistent_media ()
# snapshots with labels in ${snapshots}.
#
# When scanning a LUKS device, the user will be asked to enter the
- # passphrase; on failure to enter it, or if no persistent partitions
+ # passphrase; on failure to enter it, or if no persistence partitions
# or files were found, the LUKS device is closed.
#
# For a snapshot file the return value is ${label}=${snapdata}", where
@@ -984,7 +984,7 @@ find_persistent_media ()
# in order to probe any filesystem it contains, like we do
# below. activate_custom_mounts() also depends on that any luks
# device already has been opened.
- if echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>" && \
+ if echo ${PERSISTENCE_ENCRYPTION} | grep -qe "\<luks\>" && \
is_luks_partition ${dev}
then
if luks_device=$(open_luks_device "${dev}")
@@ -994,14 +994,14 @@ find_persistent_media ()
# skip $dev since we failed/chose not to open it
continue
fi
- elif echo ${PERSISTENT_ENCRYPTION} | grep -qve "\<none\>"
+ elif echo ${PERSISTENCE_ENCRYPTION} | grep -qve "\<none\>"
then
# skip $dev since we don't allow unencrypted storage
continue
fi
# Probe for matching GPT partition names or filesystem labels
- if echo ${PERSISTENT_STORAGE} | grep -qe "\<filesystem\>"
+ if echo ${PERSISTENCE_STORAGE} | grep -qe "\<filesystem\>"
then
result=$(probe_for_gpt_name "${overlays}" "${snapshots}" ${dev})
if [ -n "${result}" ]
@@ -1019,7 +1019,7 @@ find_persistent_media ()
fi
# Probe for files with matching name on mounted partition
- if echo ${PERSISTENT_STORAGE} | grep -qe "\<file\>"
+ if echo ${PERSISTENCE_STORAGE} | grep -qe "\<file\>"
then
result=$(probe_for_file_name "${overlays}" "${snapshots}" ${dev})
if [ -n "${result}" ]
@@ -1261,7 +1261,7 @@ do_union ()
get_custom_mounts ()
{
- # Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistent
+ # Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistence
# Side-effect: prints info to file $custom_mounts
local custom_mounts=${1}
@@ -1280,7 +1280,7 @@ get_custom_mounts ()
fi
local device_name="$(basename ${device})"
- local backing=$(mount_persistent_media ${device})
+ local backing=$(mount_persistence_media ${device})
if [ -z "${backing}" ]
then
continue
@@ -1294,7 +1294,7 @@ get_custom_mounts ()
if [ -n "${DEBUG}" ] && [ -e "${include_list}" ]
then
- cp ${include_list} ${rootmnt}/live/persistent/${persistence_list}.${device_name}
+ cp ${include_list} ${rootmnt}/live/persistence/${persistence_list}.${device_name}
fi
while read dir options # < ${include_list}
@@ -1374,7 +1374,7 @@ get_custom_mounts ()
do
if echo ${source} | grep -qe "^${prev_source}\(/.*\)\?$"
then
- panic "Two persistent mounts have the same or nested sources: ${source} on ${dest}, and ${prev_source} on ${prev_dest}"
+ panic "Two persistence mounts have the same or nested sources: ${source} on ${dest}, and ${prev_source} on ${prev_dest}"
fi
prev_source=${source}
prev_dest=${dest}
@@ -1440,13 +1440,13 @@ activate_custom_mounts ()
done
fi
- # if ${source} doesn't exist on our persistent media
+ # if ${source} doesn't exist on our persistence media
# we bootstrap it with $dest from the live filesystem.
# this both makes sense and is critical if we're
# dealing with /etc or other system dir.
if [ ! -d "${source}" ]
then
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
continue
elif [ -n "${opt_union}" ] || [ -n "${opt_linkfiles}" ]
@@ -1486,13 +1486,13 @@ activate_custom_mounts ()
done
fi
- if [ -n "${opt_linkfiles}" ] && [ -z "${PERSISTENT_READONLY}" ]
+ if [ -n "${opt_linkfiles}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
link_files ${source} ${dest} ${rootmnt}
- elif [ -n "${opt_linkfiles}" ] && [ -n "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_linkfiles}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
- mkdir -p ${rootmnt}/live/persistent
- local links_source=$(mktemp -d ${rootmnt}/live/persistent/links-source-XXXXXX)
+ mkdir -p ${rootmnt}/live/persistence
+ local links_source=$(mktemp -d ${rootmnt}/live/persistence/links-source-XXXXXX)
chown_ref ${source} ${links_source}
chmod_ref ${source} ${links_source}
# We put the cow dir in the below strange place to
@@ -1502,24 +1502,24 @@ activate_custom_mounts ()
# be linked, causing breakage.
if [ -n "${rootmnt}" ]
then
- local cow_dir="/overlay/live/persistent/$(basename ${links_source})"
+ local cow_dir="/overlay/live/persistence/$(basename ${links_source})"
else
# This is happens if persistence is activated
# post boot
- local cow_dir="/live/overlay/live/persistent/$(basename ${links_source})"
+ local cow_dir="/live/overlay/live/persistence/$(basename ${links_source})"
fi
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
chmod_ref "${source}" "${cow_dir}"
do_union ${links_source} ${cow_dir} ${source} ${rofs_dest_backing}
link_files ${links_source} ${dest} ${rootmnt}
- elif [ -n "${opt_union}" ] && [ -z "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_union}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
do_union ${dest} ${source} ${rofs_dest_backing}
- elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
mount --bind "${source}" "${dest}"
- elif [ -n "${opt_bind}" -o -n "${opt_union}" ] && [ -n "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_bind}" -o -n "${opt_union}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
# bind-mount and union mount are handled the same
# in read-only mode, but note that rofs_dest_backing
@@ -1561,12 +1561,12 @@ fix_home_rw_compatibility ()
{
local device=${1}
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
return
fi
- local backing="$(mount_persistent_media ${device})"
+ local backing="$(mount_persistence_media ${device})"
if [ -z "${backing}" ]
then
return
--
live-boot
More information about the debian-live-changes
mailing list