summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Clobus <rclobus@rclobus.nl>2019-06-16 11:55:37 +0200
committerRoland Clobus <rclobus@rclobus.nl>2019-06-16 12:47:29 +0200
commitc8fddcd70216742fa658257f896f94460af33f3b (patch)
treef7c5ac4c0eb9a982dced967729bc2c4bf80893f6
parent554c37fd9e4304764f27ca212f02fae7e6ca2b75 (diff)
downloadvyos-live-build-c8fddcd70216742fa658257f896f94460af33f3b.tar.gz
vyos-live-build-c8fddcd70216742fa658257f896f94460af33f3b.zip
Manpage: Added documentation for --firmware-binary and --firmware-chroot
-rw-r--r--manpages/en/lb_config.18
-rwxr-xr-xscripts/build/config4
2 files changed, 10 insertions, 2 deletions
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 66f45c624..04df2c311 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -99,6 +99,10 @@
.br
[\fB\-\-fdisk\fR fdisk|fdisk.dist]
.br
+ [\fB\-\-firmware\-binary true|false]
+.br
+ [\fB\-\-firmware\-chroot true|false]
+.br
[\fB\-\-force\fR]
.br
[\fB\-\-grub\-splash\fR \fIFILE\fR]
@@ -323,6 +327,10 @@ defines the parent debian\-installer distribution for derivatives of the resulti
prepares a report of the currently present live system configuration and the version of live\-build used. This is useful to provide if you submit bug reports, we do get all information required for us to locate and replicate an error.
.IP "\fB\-\-fdisk\fR fdisk|fdisk.dist" 4
sets the filename of the fdisk binary from the host system that should be used. This is autodetected and does generally not need any customization.
+.IP "\fB\-\-firmware\-binary\fR true|false" 4
+include firmware packages in debian-installer. Defaults to true.
+.IP "\fB\-\-firmware\-chroot\fR true|false" 4
+include firmware packages in debian-installer. Defaults to true.
.IP "\fB\-\-force\fR" 4
forces re\-execution of already run stages. Use only if you know what you are doing. It is generally safer to use \fBlb clean\fR to clean up before re\-executing \fBlb build\fR.
.IP "\fB\-\-grub\-splash\fR \fIFILE\fR" 4
diff --git a/scripts/build/config b/scripts/build/config
index e7d8966fc..87cc0aa90 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -61,6 +61,8 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--parent-debian-installer-distribution CODENAME]\n\
\t [--dump]\n\
\t [--fdisk fdisk|fdisk.dist]\n\
+\t [--firmware-binary true|false]\n\
+\t [--firmware-chroot true|false]\n\
\t [--force]\n\
\t [--grub-splash FILE]\n\
\t [--gzip-options OPTION|\"OPTIONS\"]\n\
@@ -115,8 +117,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--security true|false]\n\
\t [--source true|false]\n\
\t [-s|--source-images iso|netboot|tar|hdd]\n\
-\t [--firmware-binary true|false]\n\
-\t [--firmware-chroot true|false]\n\
\t [--swap-file-path PATH]\n\
\t [--swap-file-size MB]\n\
\t [--tasksel apt|aptitude|tasksel]\n\