1.1 --- a/config/global/download.in	Fri Oct 31 12:46:59 2008 +0000
     1.2 +++ b/config/global/download.in	Fri Oct 31 18:27:27 2008 +0000
     1.3 @@ -156,7 +156,7 @@
     1.4      default "socks4"    if PROXY_TYPE_SOCKS_4
     1.5      default "socks5"    if PROXY_TYPE_SOCKS_5
     1.6  
     1.7 -menuconfig USE_LAN_MIRROR
     1.8 +menuconfig USE_MIRROR
     1.9      bool
    1.10      prompt "Use LAN mirror"
    1.11      default n
    1.12 @@ -171,46 +171,54 @@
    1.13        Obviously, nothing prevents you from using a mirror that is in fact
    1.14        *not* on your LAN, for example on another subnet of your company's
    1.15        network, or a mirror on the Internet.
    1.16 +      
    1.17 +      I (Yann E. MORIN) have set up such a mirror to host snapshots of
    1.18 +      some components, when those snapshots are volatile on the upstream
    1.19 +      servers. The mirror is *slow*, because it is hosted behind an ADSL
    1.20 +      line. For the time being, I haven't set up bandwidth limitations,
    1.21 +      but should the mirror be abused, I will. Please avoid using my
    1.22 +      machine when you can...
    1.23 +      The mirror is available as (fill in those values in the fields
    1.24 +      below):
    1.25 +        host name: ymorin.is-a-geek.org
    1.26 +        base dir : /mirrors
    1.27  
    1.28 -if USE_LAN_MIRROR
    1.29 +if USE_MIRROR
    1.30  
    1.31 -config LAN_MIRROR_USE_PROXY
    1.32 +config PREFER_MIRROR
    1.33      bool
    1.34 -    prompt "Use the proxy"
    1.35 +    prompt "Prefer the LAN mirror"
    1.36      default n
    1.37 -    depends on USE_PROXY
    1.38      help
    1.39 -      Say 'Y' here if you need to use the proxy to connect to the LAN mirror.
    1.40 -      
    1.41 -      You'll need to say 'Y' if the LAN mirror is not really on your LAN.
    1.42 +      Say 'Y' here if you prefer the LAN miror over the upstream sources.
    1.43  
    1.44  choice
    1.45      bool
    1.46      prompt "Server type:"
    1.47  
    1.48 -config LAN_MIRROR_HTTP
    1.49 +config MIRROR_HTTP
    1.50      bool
    1.51      prompt "http"
    1.52  
    1.53 -config LAN_MIRROR_FTP
    1.54 +config MIRROR_FTP
    1.55      bool
    1.56      prompt "ftp"
    1.57  
    1.58  endchoice # Server type
    1.59  
    1.60 -config LAN_MIRROR_SCHEME
    1.61 +config MIRROR_SCHEME
    1.62      string
    1.63 -    default "http"  if LAN_MIRROR_HTTP
    1.64 -    default "ftp"   if LAN_MIRROR_FTP
    1.65 +    default "http"  if MIRROR_HTTP
    1.66 +    default "ftp"   if MIRROR_FTP
    1.67  
    1.68 -config LAN_MIRROR_HOSTNAME
    1.69 +config MIRROR_HOSTNAME
    1.70      string
    1.71      prompt "hostname"
    1.72      default ""
    1.73      help
    1.74        Enter here the hostname on your LAN mirror.
    1.75  
    1.76 -config LAN_MIRROR_BASE
    1.77 +config MIRROR_BASE
    1.78      string
    1.79      prompt "Base directory"
    1.80      default ""
    1.81 @@ -223,7 +231,7 @@
    1.82        
    1.83        where <name> is replaced with the actual package name.
    1.84  
    1.85 -config LAN_MIRROR_LS_R
    1.86 +config MIRROR_LS_R
    1.87      bool
    1.88  #    prompt "Use ls-lR et al."
    1.89      depends on EXPERIMENTAL
    1.90 @@ -238,7 +246,7 @@
    1.91          find.txt        (ditto)
    1.92          ls-lR
    1.93  
    1.94 -endif # USE_LAN_MIRROR
    1.95 +endif # USE_MIRROR
    1.96  
    1.97  config CONNECT_TIMEOUT
    1.98      int