[SCM] live-boot branch, debian, updated. debian/3.0_a27-1
Daniel Baumann
daniel at debian.org
Mon Apr 9 16:59:18 UTC 2012
The following commit has been merged in the debian branch:
commit 0622a98c98d454e80118d00ec76226ff209e1bc1
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Apr 9 15:13:58 2012 +0200
Renamling linkfiles option when using persistence to simply link.
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 27ad650..5c39cfe 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 2012\-04\-08 3.0~a26\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-04\-09 3.0~a26\-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fP \- System Boot Scripts
diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/live-persistence.conf.de.5
index 73b45be..6937b95 100644
--- a/manpages/de/live-persistence.conf.de.5
+++ b/manpages/de/live-persistence.conf.de.5
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 2012\-04\-08 3.0~a26\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-04\-09 3.0~a26\-1 "Debian Live Project"
.SH NAME
\fBlive\-persistence.conf\fP \- Configuration file for persistence media in
@@ -53,8 +53,8 @@ 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 persistence media. The bootstrapping will not happen when the
-\fBlinkfiles\fP or \fBunion\fP options are used (see below).
+on the persistence media. The bootstrapping will not happen when the \fBlink\fP
+or \fBunion\fP options are used (see below).
.SH OPTIONS
Custom mounts defined in \fBlive\-persistence.conf\fP accept the following
@@ -73,7 +73,7 @@ The following options are mutually exclusive (only the last given one will
be in effect):
.IP \fBbind\fP 4
Bind\-mount the source directory to \fIDIR\fP. This is the default.
-.IP \fBlinkfiles\fP 4
+.IP \fBlink\fP 4
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
@@ -82,13 +82,12 @@ links in \fIDIR\fP will only remove the link, not the corresponding file in the
source; removed links will reappear after a reboot. To permanently add or
delete a file one must do so directly in the source directory.
.IP
-Effectively \fBlinkfiles\fP will make only files already in the source
-directory persistent, not any other files in \fIDIR\fP. These files must be
-manually added to the source directory to make use of this option, and they
-will appear in \fIDIR\fP in addition to files already 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.
+Effectively \fBlink\fP will make only files already in the source directory
+persistent, not any other files in \fIDIR\fP. These files must be manually
+added to the source directory to make use of this option, and they will
+appear in \fIDIR\fP in addition to files already 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\fP 4
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
@@ -104,7 +103,7 @@ supported with \fBunion=unionmount\fP.
All persistence volumes will be mounted here (in a directory corresponding
to the device name). The \fBlive\-persistence.conf\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).
+practical for custom mounts using the \fBlink\fP option).
.SH EXAMPLES
@@ -113,10 +112,10 @@ Let's say we have a persistence volume \fIVOL\fP with the a
for ease of reference):
.TP 7
1.
-/home/user1 linkfiles,source=config\-files/user1
+/home/user1 link,source=config\-files/user1
.TP
2.
-/home/user2 linkfiles,source=config\-files/user2
+/home/user2 link,source=config\-files/user2
.TP
3.
/home
@@ -174,7 +173,7 @@ c)
.PP
One could argue, though, that lines 1 and 2 in the example
\fBlive\-persistence.conf\fP file above are unnecessary since line 3 already
-would make all of /home persistent. The \fBlinkfiles\fP option is intended for
+would make all of /home persistent. The \fBlink\fP option is intended for
situations where you don't want a complete directory to be persistent, only
certain files in it or its sub\-directories.
.PP
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 72ca829..d3af9d1 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 2012\-04\-08 3.0~a26\-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-04\-09 3.0~a26\-1 "Debian Live Project"
.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 e5ac8ab..e094b1c 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-04\-08 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-04\-09 3.0~a26-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5
index b680f51..870ec9f 100644
--- a/manpages/en/live-persistence.conf.5
+++ b/manpages/en/live-persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-04\-08 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-04\-09 3.0~a26-1 "Debian Live Project"
.SH NAME
\fBlive-persistence.conf\fR \- Configuration file for persistence media in
@@ -51,7 +51,7 @@ 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 persistence media. The
-bootstrapping will not happen when the \fBlinkfiles\fR or \fBunion\fR
+bootstrapping will not happen when the \fBlink\fR or \fBunion\fR
options are used (see below).
.SH OPTIONS
@@ -71,7 +71,7 @@ The following options are mutually exclusive (only the last given one
will be in effect):
.IP "\fBbind\fR" 4
Bind-mount the source directory to \fIDIR\fR. This is the default.
-.IP "\fBlinkfiles\fR" 4
+.IP "\fBlink\fR" 4
Create the directory structure of the source directory on the
persistence media in \fIDIR\fR and create symbolic links from the
corresponding place in \fIDIR\fR to each file in the source directory.
@@ -81,7 +81,7 @@ remove the link, not the corresponding file in the source; removed
links will reappear after a reboot. To permanently add or delete a
file one must do so directly in the source directory.
.IP
-Effectively \fBlinkfiles\fR will make only files already in the source
+Effectively \fBlink\fR will make only files already in the source
directory persistent, not any other files in \fIDIR\fR. These files
must be manually added to the source directory to make use of this
option, and they will appear in \fIDIR\fR in addition to files already
@@ -105,7 +105,7 @@ All persistence volumes will be mounted here (in a directory
corresponding to the device name). The \fBlive-persistence.conf\fR file can
easily be edited through this mount, as well as any source directories
(which is especially practical for custom mounts using the
-\fBlinkfiles\fR option).
+\fBlink\fR option).
.SH EXAMPLES
@@ -114,10 +114,10 @@ Let's say we have a persistence volume \fIVOL\fR with the a
for ease of reference):
.TP 7
1.
-/home/user1 linkfiles,source=config-files/user1
+/home/user1 link,source=config-files/user1
.TP
2.
-/home/user2 linkfiles,source=config-files/user2
+/home/user2 link,source=config-files/user2
.TP
3.
/home
@@ -175,7 +175,7 @@ Link:
.PP
One could argue, though, that lines 1 and 2 in the example
\fBlive-persistence.conf\fR file above are unnecessary since line 3 already
-would make all of /home persistent. The \fBlinkfiles\fR option is
+would make all of /home persistent. The \fBlink\fR option is
intended for situations where you don't want a complete directory to
be persistent, only certain files in it or its sub-directories.
.PP
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 2587c56..dbe9d6f 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2012\-04\-08 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-04\-09 3.0~a26-1 "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 e498ea7..9206258 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-04-08 22:48+0300\n"
+"POT-Creation-Date: 2012-04-09 15:13+0300\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-08"
+msgid "2012-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/live-persistence.conf.5.po b/manpages/po/de/live-persistence.conf.5.po
index dbcb269..fa2c8b3 100644
--- a/manpages/po/de/live-persistence.conf.5.po
+++ b/manpages/po/de/live-persistence.conf.5.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-04-08 22:48+0300\n"
+"POT-Creation-Date: 2012-04-09 15:13+0300\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-08"
+msgid "2012-04-09"
msgstr ""
#. type: TH
@@ -188,8 +188,8 @@ msgid ""
"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 persistence media. The bootstrapping will not happen when the "
-"B<linkfiles> or B<union> options are used (see below)."
+"on the persistence media. The bootstrapping will not happen when the B<link> "
+"or B<union> options are used (see below)."
msgstr ""
#. type: Plain text
@@ -239,7 +239,7 @@ msgstr ""
#. type: IP
#: en/live-persistence.conf.5:74
#, no-wrap
-msgid "B<linkfiles>"
+msgid "B<link>"
msgstr ""
#. type: Plain text
@@ -257,13 +257,12 @@ msgstr ""
#. type: Plain text
#: en/live-persistence.conf.5:91
msgid ""
-"Effectively B<linkfiles> will make only files already in the source "
-"directory persistent, not any other files in I<DIR>. These files must be "
-"manually added to the source directory to make use of this option, and they "
-"will appear in I<DIR> in addition to files already 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."
+"Effectively B<link> will make only files already in the source directory "
+"persistent, not any other files in I<DIR>. These files must be manually "
+"added to the source directory to make use of this option, and they will "
+"appear in I<DIR> in addition to files already 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."
msgstr ""
#. type: IP
@@ -303,7 +302,7 @@ msgid ""
"All persistence volumes will be mounted here (in a directory corresponding "
"to the device name). The B<live-persistence.conf> 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)."
+"practical for custom mounts using the B<link> option)."
msgstr ""
#. type: SH
@@ -328,7 +327,7 @@ msgstr ""
#. type: Plain text
#: en/live-persistence.conf.5:118
-msgid "/home/user1 linkfiles,source=config-files/user1"
+msgid "/home/user1 link,source=config-files/user1"
msgstr ""
#. type: TP
@@ -339,7 +338,7 @@ msgstr ""
#. type: Plain text
#: en/live-persistence.conf.5:121
-msgid "/home/user2 linkfiles,source=config-files/user2"
+msgid "/home/user2 link,source=config-files/user2"
msgstr ""
#. type: TP
@@ -486,9 +485,9 @@ msgstr ""
msgid ""
"One could argue, though, that lines 1 and 2 in the example B<live-"
"persistence.conf> file above are unnecessary since line 3 already would make "
-"all of /home persistent. The B<linkfiles> option is intended for situations "
-"where you don't want a complete directory to be persistent, only certain "
-"files in it or its sub-directories."
+"all of /home persistent. The B<link> option is intended for situations where "
+"you don't want a complete directory to be persistent, only certain files in "
+"it or its sub-directories."
msgstr ""
#. type: Plain text
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 256008a..aef7a2a 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-04-08 22:48+0300\n"
+"POT-Creation-Date: 2012-04-09 15:13+0300\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-08"
+msgid "2012-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 9a85163..cffb9cd 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 22:48+0300\n"
+"POT-Creation-Date: 2012-04-09 15:13+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"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-08"
+msgid "2012-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-persistence.conf.5.pot b/manpages/pot/live-persistence.conf.5.pot
index cf912ea..d02aa44 100644
--- a/manpages/pot/live-persistence.conf.5.pot
+++ b/manpages/pot/live-persistence.conf.5.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-04-08 22:48+0300\n"
+"POT-Creation-Date: 2012-04-09 15:13+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"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-08"
+msgid "2012-04-09"
msgstr ""
#. type: TH
@@ -188,8 +188,8 @@ msgid ""
"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 persistence media. The bootstrapping will not happen when the "
-"B<linkfiles> or B<union> options are used (see below)."
+"on the persistence media. The bootstrapping will not happen when the B<link> "
+"or B<union> options are used (see below)."
msgstr ""
#. type: Plain text
@@ -239,7 +239,7 @@ msgstr ""
#. type: IP
#: en/live-persistence.conf.5:74
#, no-wrap
-msgid "B<linkfiles>"
+msgid "B<link>"
msgstr ""
#. type: Plain text
@@ -257,13 +257,12 @@ msgstr ""
#. type: Plain text
#: en/live-persistence.conf.5:91
msgid ""
-"Effectively B<linkfiles> will make only files already in the source "
-"directory persistent, not any other files in I<DIR>. These files must be "
-"manually added to the source directory to make use of this option, and they "
-"will appear in I<DIR> in addition to files already 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."
+"Effectively B<link> will make only files already in the source directory "
+"persistent, not any other files in I<DIR>. These files must be manually "
+"added to the source directory to make use of this option, and they will "
+"appear in I<DIR> in addition to files already 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."
msgstr ""
#. type: IP
@@ -303,7 +302,7 @@ msgid ""
"All persistence volumes will be mounted here (in a directory corresponding "
"to the device name). The B<live-persistence.conf> 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)."
+"practical for custom mounts using the B<link> option)."
msgstr ""
#. type: SH
@@ -328,7 +327,7 @@ msgstr ""
#. type: Plain text
#: en/live-persistence.conf.5:118
-msgid "/home/user1 linkfiles,source=config-files/user1"
+msgid "/home/user1 link,source=config-files/user1"
msgstr ""
#. type: TP
@@ -339,7 +338,7 @@ msgstr ""
#. type: Plain text
#: en/live-persistence.conf.5:121
-msgid "/home/user2 linkfiles,source=config-files/user2"
+msgid "/home/user2 link,source=config-files/user2"
msgstr ""
#. type: TP
@@ -486,9 +485,9 @@ msgstr ""
msgid ""
"One could argue, though, that lines 1 and 2 in the example B<live-"
"persistence.conf> file above are unnecessary since line 3 already would make "
-"all of /home persistent. The B<linkfiles> option is intended for situations "
-"where you don't want a complete directory to be persistent, only certain "
-"files in it or its sub-directories."
+"all of /home persistent. The B<link> option is intended for situations where "
+"you don't want a complete directory to be persistent, only certain files in "
+"it or its sub-directories."
msgstr ""
#. type: Plain text
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index d1b8823..c4e4824 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 22:48+0300\n"
+"POT-Creation-Date: 2012-04-09 15:13+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"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-08"
+msgid "2012-04-09"
msgstr ""
#. type: TH
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 0e1b691..58613d5 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1317,15 +1317,15 @@ get_custom_mounts ()
fi
local opt_source=""
- local opt_linkfiles=""
+ local opt_link=""
for opt in $(echo ${options} | tr ',' ' ');
do
case "${opt}" in
source=*)
opt_source=${opt#source=}
;;
- linkfiles)
- opt_linkfiles="yes"
+ link)
+ opt_link="yes"
;;
union|bind)
;;
@@ -1350,7 +1350,7 @@ get_custom_mounts ()
local full_source="$(trim_path ${backing}/${source})"
local full_dest="$(trim_path ${rootmnt}/${dir})"
- if [ -n "${opt_linkfiles}" ]
+ if [ -n "${opt_link}" ]
then
echo "${device} ${full_source} ${full_dest} ${options}" >> ${links}
else
@@ -1394,22 +1394,22 @@ activate_custom_mounts ()
while read device source dest options # < ${custom_mounts}
do
local opt_bind="yes"
- local opt_linkfiles=""
+ local opt_link=""
local opt_union=""
for opt in $(echo ${options} | tr ',' ' ');
do
case "${opt}" in
bind)
opt_bind="yes"
- unset opt_linkfiles opt_union
+ unset opt_link opt_union
;;
- linkfiles)
- opt_linkfiles="yes"
+ link)
+ opt_link="yes"
unset opt_bind opt_union
;;
union)
opt_union="yes"
- unset opt_bind opt_linkfiles
+ unset opt_bind opt_link
;;
esac
done
@@ -1454,10 +1454,10 @@ activate_custom_mounts ()
if [ -n "${PERSISTENCE_READONLY}" ]
then
continue
- elif [ -n "${opt_union}" ] || [ -n "${opt_linkfiles}" ]
+ elif [ -n "${opt_union}" ] || [ -n "${opt_link}" ]
then
# unions and don't need to be bootstrapped
- # linkfiles dirs can't be bootstrapped in a sensible way
+ # link dirs can't be bootstrapped in a sensible way
mkdir -p "${source}"
chown_ref "${dest}" "${source}"
chmod_ref "${dest}" "${source}"
@@ -1472,7 +1472,7 @@ activate_custom_mounts ()
# XXX: If CONFIG_AUFS_ROBR is added to the Debian kernel we can
# ignore the loop below and set rofs_dest_backing=$dest
local rofs_dest_backing=""
- if [ -n "${opt_linkfiles}"]
+ if [ -n "${opt_link}"]
then
for d in ${rootmnt}/live/rofs/*
do
@@ -1491,10 +1491,10 @@ activate_custom_mounts ()
done
fi
- if [ -n "${opt_linkfiles}" ] && [ -z "${PERSISTENCE_READONLY}" ]
+ if [ -n "${opt_link}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
link_files ${source} ${dest} ${rootmnt}
- elif [ -n "${opt_linkfiles}" ] && [ -n "${PERSISTENCE_READONLY}" ]
+ elif [ -n "${opt_link}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
mkdir -p ${rootmnt}/live/persistence
local links_source=$(mktemp -d ${rootmnt}/live/persistence/links-source-XXXXXX)
@@ -1537,7 +1537,7 @@ activate_custom_mounts ()
# post boot
local cow_dir="/live/overlay/${dest}"
fi
- if [ -e "${cow_dir}" ] && [ -z "${opt_linkfiles}" ]
+ if [ -e "${cow_dir}" ] && [ -z "${opt_link}" ]
then
# If an earlier custom mount has files here
# it will "block" the current mount's files
--
live-boot
More information about the debian-live-changes
mailing list