summaryrefslogtreecommitdiffstats
path: root/debootstrap
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xdebootstrap8
-rw-r--r--debootstrap.84
2 files changed, 12 insertions, 0 deletions
diff --git a/debootstrap b/debootstrap
index 3d45c9c..e987112 100755
--- a/debootstrap
+++ b/debootstrap
@@ -27,6 +27,7 @@ LANG=C
USE_COMPONENTS=main
KEYRING=""
DISABLE_KEYRING=""
+FORCE_KEYRING=""
VARIANT=""
ARCH=""
HOST_ARCH=""
@@ -104,6 +105,9 @@ usage()
scratchbox, minbase)
--keyring=K check Release files against keyring K
--no-check-gpg avoid checking Release file signatures
+ --force-check-gpg force checking Release file signatures
+ (also disables automatic fallback to HTTPS in case
+ of a missing keyring), aborting otherwise
--no-resolve-deps don't try to resolve dependencies automatically
--unpack-tarball=T acquire .debs from a tarball instead of http
@@ -319,6 +323,10 @@ if [ $# != 0 ] ; then
shift 1
DISABLE_KEYRING=1
;;
+ --force-check-gpg)
+ shift 1
+ FORCE_KEYRING=1
+ ;;
--certificate|--certificate=?*)
if [ "$1" = "--certificate" -a -n "$2" ]; then
CERTIFICATE="--certificate=$2"
diff --git a/debootstrap.8 b/debootstrap.8
index 2cf44ca..106d172 100644
--- a/debootstrap.8
+++ b/debootstrap.8
@@ -93,6 +93,10 @@ to check signatures of retrieved Release files.
.IP "\fB\-\-no-check-gpg\fP"
Disables checking gpg signatures of retrieved Release files.
.IP
+.IP "\fB\-\-force-check-gpg\fP"
+Forces checking Release file signatures, disabling automatic fallback to
+HTTPS in case of a missing keyring.
+.IP
.IP "\fB\-\-verbose\fP"
Produce more info about downloading.
.IP