diff options
| author | Ben Armstrong <synrg@debian.org> | 2010-12-11 12:34:05 -0400 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:31 +0100 |
| commit | f10c468359641e8f64dab76c8f685077271e0f91 (patch) | |
| tree | 1a54e55db672bd3ec3f1ea101bdb1ccf85267e2d | |
| parent | 6380f4dbee2eaedecc0bb4d59cfa615e852ba77b (diff) | |
| download | vyos-live-build-f10c468359641e8f64dab76c8f685077271e0f91.tar.gz vyos-live-build-f10c468359641e8f64dab76c8f685077271e0f91.zip | |
Adding '--includes none' documentation in help and man page.
| -rw-r--r-- | manpages/en/lb_config.1 | 4 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 97346d700..88a7567c7 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -331,8 +331,8 @@ defines which hooks available in /usr/share/live/build/examples/hooks should be sets the hostname of the live system. .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. -.IP "\fB\-\-includes\fR \fIPATH\fR" 4 -sets the path to the includes that live\-build is going to use, e.g. additional minimal documentation that you want to have on all live systems. By default, this is set to /usr/share/live/build/includes/. +.IP "\fB\-\-includes\fR \fIPATH|none\fR" 4 +sets the path to the includes that live\-build is going to use, e.g. additional minimal documentation that you want to have on all live systems. By default, this is set to /usr/share/live/build/includes/. Choose none to disable inclusion of documentation. .IP "\fB\-\-initramfs\fR auto|none|live\-boot|live\-initramfs|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\-initramfs for legacy lenny, and to live\-boot for squeeze and newer. Using 'none' is useful if the resulting system image should not be a live image (experimental). .IP "\fB\-\-interactive\fR shell" 4 diff --git a/scripts/build/lb_config b/scripts/build/lb_config index d21f79f9f..bd3928f67 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -76,7 +76,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--hooks FILE]\n\ \t [--hostname NAME]\n\ \t [--ignore-system-defaults]\n\ -\t [--includes PATH]\n\ +\t [--includes PATH|none]\n\ \t [--initramfs auto|none|live-boot|live-initramfs|casper]\n\ \t [--interactive shell]\n\ \t [--isohybrid-options OPTION|\"OPTIONS\"]\n\ |