diff options
| author | Miguel Figueiredo <elmig-guest@users.alioth.debian.org> | 2010-09-10 20:53:27 (GMT) |
|---|---|---|
| committer | Miguel Figueiredo <elmig-guest@users.alioth.debian.org> | 2010-09-10 20:53:27 (GMT) |
| commit | dccd27ed8bf4da446db68e274d211f28489b654a (patch) | |
| tree | 18d0e7623dc6daec620b0a2a4cce3373a5ef1fc4 /debootstrap | |
| parent | a595b2efa082da386e04a181f449657bfab2d9f1 (diff) | |
| download | debootstrap-dccd27ed8bf4da446db68e274d211f28489b654a.zip debootstrap-dccd27ed8bf4da446db68e274d211f28489b654a.tar.gz debootstrap-dccd27ed8bf4da446db68e274d211f28489b654a.tar.bz2 | |
support for https on debootstrap
r64676
Diffstat (limited to 'debootstrap')
| -rwxr-xr-x | debootstrap | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/debootstrap b/debootstrap index 171a5ef..0d230c8 100755 --- a/debootstrap +++ b/debootstrap @@ -94,6 +94,9 @@ usage() (supported: $EXTRACTORS_SUPPORTED) --boot-floppies used for internal purposes by boot-floppies --debian-installer used for internal purposes by debian-installer + --private-key=file read the private key from file + --certificate=file use the client certificate stored in file (PEM) + --no-check-certificate do not check certificate against certificate authorities EOF } @@ -301,6 +304,32 @@ if [ $# != 0 ] ; then error 1 NEEDARG "option requires an argument %s" "$1" fi ;; + --certificate|--certificate=?*) + if [ "$1" = "--certificate" -a -n "$2" ]; then + CERTIFICATE="--certificate=$2" + shift 2 + elif [ "$1" != "${1#--certificate=}" ]; then + CERTIFICATE="--certificate=${1#--certificate=}" + shift 1 + else + error 1 NEEDARG "option requires an argument %s" "$1" + fi + ;; + --private-key|--private-key=?*) + if [ "$1" = "--private-key" -a -n "$2" ]; then + PRIVATEKEY="$2" + shift 2 + elif [ "$1" != "${1#--private-key=}" ]; then + PRIVATEKEY="--private--key=${1#--private-key=}" + shift 1 + else + error 1 NEEDARG "option requires an argument %s" "$1" + fi + ;; + --no-check-certificate) + CHECKCERTIF="--no-check-certificate" + shift + ;; --*) error 1 BADARG "unrecognized or invalid option %s" "$1" ;; @@ -477,6 +506,7 @@ fi ########################################################################### if am_doing_phase finddebs; then + echo "finddebs!!!" if [ "$FINDDEBS_NEEDS_INDICES" = "true" ] || \ [ "$RESOLVE_DEPS" = "true" ]; then download_indices @@ -577,7 +607,7 @@ if am_doing_phase second_stage; then if [ -e "$TARGET/etc/apt/sources.list" ]; then rm -f "$TARGET/etc/apt/sources.list" fi - if [ "${MIRRORS#http://}" != "$MIRRORS" ]; then + if [ "${MIRRORS#http*://}" != "$MIRRORS" ]; then setup_apt_sources "${MIRRORS%% *}" mv_invalid_to "${MIRRORS%% *}" else |