On Mon, Jul 10, 2017 at 04:46:23PM +0200, Pino Toscano wrote:
When there is no proxy set, pass an empty string to the Debian
Installer. This way, the installer will not ask for a proxy.
---
builder/templates/make-template.ml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/builder/templates/make-template.ml b/builder/templates/make-template.ml
index 164e146..fe9a44f 100755
--- a/builder/templates/make-template.ml
+++ b/builder/templates/make-template.ml
@@ -726,7 +726,11 @@ and make_virt_install_command os arch ks tmpname tmpout tmpefivars
location
let proxy =
let p = try Some (Sys.getenv "http_proxy") with Not_found -> None in
match p with
- | None -> ""
+ | None ->
+ (match os with
+ | Fedora _ | RHEL _ | CentOS _ | Ubuntu _ -> ""
+ | Debian _ -> "mirror/http/proxy="
+ )
| Some p ->
match os with
| Fedora _ | RHEL _ | CentOS _ -> "proxy=" ^ p
--
2.9.4
ACK series, thanks.
Rich.
--
Richard Jones, Virtualization Group, Red Hat
http://people.redhat.com/~rjones
Read my programming and virtualization blog:
http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v