summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Clobus <rclobus@rclobus.nl>2019-06-16 11:30:49 +0200
committerRoland Clobus <rclobus@rclobus.nl>2019-06-16 12:47:29 +0200
commit7c02640b62e15a04b6f2cf3f3c165b5074c2a6e4 (patch)
tree4e575280f00dd83949270dadef7566eae026dfb1
parent05ed83a2b61a479e030a8ae309e14a49e0eac571 (diff)
downloadvyos-live-build-7c02640b62e15a04b6f2cf3f3c165b5074c2a6e4.tar.gz
vyos-live-build-7c02640b62e15a04b6f2cf3f3c165b5074c2a6e4.zip
Manpage: --mode explicitly supports debian and progress-linux. Special handling for ubuntu was dropped 2015-05-03
-rw-r--r--manpages/en/lb_config.14
-rwxr-xr-xscripts/build/config2
2 files changed, 3 insertions, 3 deletions
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 3b19ffae7..6276c4799 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -169,7 +169,7 @@
.br
[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
.br
- [\fB\-\-mode\fR debian|progress-linux|ubuntu]
+ [\fB\-\-mode\fR debian|progress-linux]
.br
[\fB\-\-system\fR live|normal]
.br
@@ -393,7 +393,7 @@ sets the location of the derivative package mirror that should end up configured
sets the location of the derivatives security package mirror that should end up configured in the final image.
.IP "\fB\-\-mirror\-debian\-installer\fR \fIURL\fR" 4
sets the location of the mirror that will be used to fetch the debian installer images of the derivative. By default, this points to the same mirror used to build the live system, i.e. the value of \-\-mirror\-bootstrap.
-.IP "\fB\-\-mode\fR debian|progress|ubuntu" 4
+.IP "\fB\-\-mode\fR debian|progress-linux" 4
defines a global mode to load project specific defaults. By default this is set to debian.
.IP "\fB\-\-system\fR live|normal" 4
defines if the resulting system image should a live system or a normal, non-live system.
diff --git a/scripts/build/config b/scripts/build/config
index e96d5211d..e7d8966fc 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -96,7 +96,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--mirror-binary URL]\n\
\t [--mirror-binary-security URL]\n\
\t [--mirror-debian-installer URL]\n\
-\t [--mode debian]\n\
+\t [--mode debian|progress-linux]\n\
\t [--system live|normal]\n\
\t [--net-root-filesystem nfs|cfs]\n\
\t [--net-root-mountoptions OPTIONS]\n\