summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-28 04:37:17 +0000
committerLyndon Brown <jnqnfe@gmail.com>2020-04-23 11:52:13 +0100
commitdb5188aa99a0eded4596f47acb2be6f9e9d0f319 (patch)
treea1fea30fb1f9084da371784f50097c413f7540bd
parent19eccf0108ecf5153988bc8ac5a39d190054560f (diff)
downloadvyos-live-build-db5188aa99a0eded4596f47acb2be6f9e9d0f319.tar.gz
vyos-live-build-db5188aa99a0eded4596f47acb2be6f9e9d0f319.zip
config: support comma and space separated list of source image types
-rwxr-xr-xfunctions/defaults.sh1
-rw-r--r--manpages/en/lb_config.12
2 files changed, 2 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index ae311a2cd..73b90bed7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -574,6 +574,7 @@ Set_config_defaults ()
# Setting image type
LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES:-tar}"
+ LB_SOURCE_IMAGES="$(echo "${LB_SOURCE_IMAGES}" | tr "," " ")"
}
Check_config_defaults ()
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 83856796f..7cbb8167f 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -467,7 +467,7 @@ defines if the security repositories specified in the security mirror options sh
.IP "\fB\-\-source\fR true|false" 4
defines if a corresponding source image to the binary image should be build. By default this is false because most people do not require this and would require to download quite a few source packages. However, if you distribute your live image to others, you should make sure you build it with a source image alongside to help enable you to comply with licensing terms.
.IP "\-s|\fB\-\-source\-images\fR iso|netboot|tar|hdd" 4
-defines the image type for the source image. Default is tar. More than one can be specified (space separated).
+defines the image type for the source image. Default is tar. More than one can be specified (comma or space separated).
.IP "\fB\-\-swap\-file\-path\fR \fIPATH\fR" 4
defines the path to a swap file to create in the binary image. Default is not to create a swap file.
.IP "\fB\-\-swap\-file\-size\fR \fIMB\fR" 4