From d8d5366a6c75dba26fd87a707bf2b4da604cf7b2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 14 Aug 2012 21:06:22 +0200 Subject: Using /etc/live/build/*.conf instead of /etc/live/build.d/*.conf for consistency reasons. --- manpages/en/lb.1 | 2 +- manpages/en/lb_binary.1 | 2 +- manpages/en/lb_bootstrap.1 | 2 +- manpages/en/lb_build.1 | 2 +- manpages/en/lb_chroot.1 | 2 +- manpages/en/lb_clean.1 | 2 +- manpages/en/lb_config.1 | 6 +++--- manpages/en/lb_source.1 | 2 +- manpages/en/lb_testroot.1 | 2 +- manpages/en/live-build.7 | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) (limited to 'manpages/en') diff --git a/manpages/en/lb.1 b/manpages/en/lb.1 index f7afdf6ef..b39e38f52 100644 --- a/manpages/en/lb.1 +++ b/manpages/en/lb.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlb\fR \- wrapper for live\-build programs diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1 index 623c371dc..dfdef32cc 100644 --- a/manpages/en/lb_binary.1 +++ b/manpages/en/lb_binary.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlb binary\fR \- Complete the binary stage diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1 index 475a7d9f5..2b2d0b41e 100644 --- a/manpages/en/lb_bootstrap.1 +++ b/manpages/en/lb_bootstrap.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlb bootstrap\fR \- Complete the bootstrap stage diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1 index 63f6404d8..5e3cc5faf 100644 --- a/manpages/en/lb_build.1 +++ b/manpages/en/lb_build.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1 index 652d26474..03a958e9f 100644 --- a/manpages/en/lb_chroot.1 +++ b/manpages/en/lb_chroot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlb chroot\fR \- Complete the chroot stage diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1 index da805ed95..2795db57f 100644 --- a/manpages/en/lb_clean.1 +++ b/manpages/en/lb_clean.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlb clean\fR \- Clean build directory diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index aeb466a03..9c1dfcf73 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlb config\fR \- Create config directory @@ -348,7 +348,7 @@ defines the default options that will be appended to (almost) every gzip call du .IP "\fB\-\-hooks\fR \fIFILE\fR" 4 defines which hooks available in /usr/share/live/build/examples/hooks should be activated. Normally, there are no hooks executed. Make sure you know and understood the hook before you enable it. .IP "\fB\-\-ignore\-system\-defaults\fR" 4 -\fBlb config\fR by default reads system defaults from /etc/live/build.conf and /etc/live/build.d when generating a new live system config directory. This is useful if you want to set global settings, such as mirror locations, and don't want to specify them all of the time. +\fBlb config\fR by default reads system defaults from \fI/etc/live/build.conf\fR and \fI/etc/live/build/*\fR when generating a new live system config directory. This is useful if you want to set global settings, such as mirror locations, and don't want to specify them all of the time. .IP "\fB\-\-initramfs\fR auto|none|live\-boot|casper" 4 sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building ubuntu systems, to live\-boot for all other systems. Using 'none' is useful if the resulting system image should not be a live image (experimental). .IP "\fB\-\-initramfs\-compression\fR bzip2|gzip|lzma] @@ -502,7 +502,7 @@ Currently, command line switches can also be specified through the corresponding .SH FILES .\" FIXME .IP "\fBauto/config\fR" 4 -.IP "\fB/etc/live/build.conf, /etc/live/build.d\fR" 4 +.IP "\fB/etc/live/build.conf, /etc/live/build/*\fR" 4 An optional, global configuration file for \fBlb config\fR variables. It is useful to specify a few system wide defaults, like LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option. .\" FIXME diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1 index 39df63836..a0ccfdd95 100644 --- a/manpages/en/lb_source.1 +++ b/manpages/en/lb_source.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlb source\fR \- Complete the source stage diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1 index 160cf8795..89f55684c 100644 --- a/manpages/en/lb_testroot.1 +++ b/manpages/en/lb_testroot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlb testroot\fR \- Ensure that a system is built as root diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 54795e31e..1d1214c10 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 7 2012\-08\-10 3.0~a57-1 "Debian Live Project" +.TH LIVE\-BUILD 7 2012\-08\-14 3.0~a57-1 "Debian Live Project" .SH NAME \fBlive\-build\fR \- the Debian Live tool suite @@ -224,7 +224,7 @@ All config files are shell scripts which are sourced by a live\-build program. T .SH FILES .IP "\fB/etc/live/build.conf\fR" 4 -.IP "\fB/etc/live/build.d/\fR" 4 +.IP "\fB/etc/live/build/*\fR" 4 .SH SEE ALSO \fIlive\-boot\fR(7) -- cgit v1.2.3