summaryrefslogtreecommitdiff
path: root/manpages/en
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-04-06 10:38:00 +0200
committerDaniel Baumann <daniel@debian.org>2012-04-06 10:38:00 +0200
commitf1087eb55a835f2b4adaaccea7b092e19a3ba6e3 (patch)
tree270d90e0bcc651e9d375f8410e2b74b215c52766 /manpages/en
parent1c158e15ba2d4b2e9cb166024393087aa3560d3d (diff)
downloadlive-boot-f1087eb55a835f2b4adaaccea7b092e19a3ba6e3.tar.gz
live-boot-f1087eb55a835f2b4adaaccea7b092e19a3ba6e3.zip
Only looking at boot.d files if they have the .conf suffix to allow putting other files into these places that do not necessarily need to be used by live-boot (e.g. documentation).
Diffstat (limited to 'manpages/en')
-rw-r--r--manpages/en/live-boot.78
-rw-r--r--manpages/en/live-snapshot.12
-rw-r--r--manpages/en/live.persist.52
3 files changed, 6 insertions, 6 deletions
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 946eeb7..36bb82b 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-04\-05 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-04\-06 3.0~a26-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
@@ -23,7 +23,7 @@ To configure the live\-boot parameters used by default in a live image, see the
In addition, there are some more boot parameters to influence the behaviour, see below.
.SS Configuration Files
-\fBlive\-boot\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/boot.conf, /etc/live/boot.d/), or on the live media (live/boot.conf, live/boot.d/).
+\fBlive\-boot\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot.conf, live/boot.d/*.conf).
.SH OPTIONS
\fBlive\-boot\fR currently features the following parameters.
@@ -154,9 +154,9 @@ This saves expensive writes and speeds up operations on volatile data such as we
.SH FILES
.IP "\fB/etc/live/boot.conf\fR" 4
-.IP "\fB/etc/live/boot.d/\fR" 4
+.IP "\fB/etc/live/boot.d/*.conf\fR" 4
.IP "\fBlive/boot.conf\fR" 4
-.IP "\fBlive/boot.d/\fR" 4
+.IP "\fBlive/boot.d/*.conf\fR" 4
.IP "\fBlive.persist\fR" 4
.SH SEE ALSO
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 0e88a32..23e7bde 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2012\-04\-05 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-04\-06 3.0~a26-1 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
diff --git a/manpages/en/live.persist.5 b/manpages/en/live.persist.5
index 615eb7a..45c19df 100644
--- a/manpages/en/live.persist.5
+++ b/manpages/en/live.persist.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT persist 2012\-04\-05 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT persist 2012\-04\-06 3.0~a26-1 "Debian Live Project"
.SH NAME
\fBlive.persist\fR \- Configuration file for persistent media in