aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-02-10 09:47:21 -0500
committerMarcoFalke <falke.marco@gmail.com>2018-02-10 09:47:23 -0500
commitfe53d5f3636aed064823bc220d828c7ff08d1d52 (patch)
tree646f987600061249fbd9ba2a3497efbf0ee32944
parent948c29cc0d2df72b2f9717b8d33c5e29e2f9582c (diff)
parent464015f6f163b0c43a1a8e20a2890ee837a6804d (diff)
downloadbitcoin-fe53d5f3636aed064823bc220d828c7ff08d1d52.tar.xz
Merge #12394: gitian-builder.sh: fix --setup doc, since lxc is default
464015f6f1 [scripts] gitian-builder.sh: fix --setup doc, LXC is default (Sjors Provoost) Pull request description: Tree-SHA512: 9e4c029bc0179265b20a6cecf13619f0e9d932b6911832d1aa6fc488c62c6e60bc5a10eb6eff4c668ef9cbc66942ca5c13177d0bc3b9259398780ce12a53a645
-rwxr-xr-xcontrib/gitian-build.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
index 631fba9089..d334c1642f 100755
--- a/contrib/gitian-build.sh
+++ b/contrib/gitian-build.sh
@@ -47,7 +47,7 @@ Options:
-j Number of processes to use. Default 2
-m Memory to allocate in MiB. Default 2000
--kvm Use KVM instead of LXC
---setup Set up the Gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. Only works on Debian-based systems (Ubuntu, Debian)
+--setup Set up the Gitian building environment. Uses LXC. If you want to use KVM, use the --kvm option. Only works on Debian-based systems (Ubuntu, Debian)
--detach-sign Create the assert file for detached signing. Will not commit anything.
--no-commit Do not commit anything to git
-h|--help Print this help message