[SCM] debian-live/config-webc branch, hetty, updated. b7c99a69d4fa67a9cea24f644f54c94814c55c45

[Kai Hendry]

The following commit has been merged in the hetty branch:
commit b01de48c0bcd75faa46801e1961bc2e973b8ab11
Merge: 3cd516aa3d936f7a3829ae5b2b3e9c6b24fca3d6 96361366ec21c20776e51a7c100ae75b6906117d
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Nov 9 13:27:37 2008 +0100

    Merge branch 'master' into hetty
    
    Conflicts:
    
    	webconverger/config/bootstrap

diff --combined webconverger/config/bootstrap
index 7b912ee,45d3324..ddb7e82
--- a/webconverger/config/bootstrap
+++ b/webconverger/config/bootstrap
@@@ -1,53 -1,3 +1,24 @@@
  LH_ARCHITECTURE="i386"
- # config/bootstrap - options for live-helper(7), bootstrap stage
- 
- # $LH_ARCHITECTURE: select chroot architecture
- # (Default: autodetected)
- 
- # $LH_BOOTSTRAP_CONFIG: set distribution config directory
- # (Default: empty)
- #LH_BOOTSTRAP_CONFIG=""
- 
- # $LH_BOOTSTRAP_INCLUDE: include packages on base
- # (Default: empty)
- #LH_BOOTSTRAP_INCLUDE=""
- 
- # $LH_BOOTSTRAP_EXCLUDE: exclude packages on base
- # (Default: empty)
- #LH_BOOTSTRAP_EXCLUDE=""
- 
- # $LH_BOOTSTRAP_FLAVOUR: select flavour to use
- # (Default: )
- #LH_BOOTSTRAP_FLAVOUR=""
- 
- # $LH_BOOTSTRAP_KEYRING: set distribution keyring
- # (Default: empty)
- #LH_BOOTSTRAP_KEYRING=""
- 
- # $LH_DISTRIBUTION: select distribution to use
- # (Default: lenny)
  LH_DISTRIBUTION="lenny"
 -LH_CATEGORIES="main contrib"
 +
 +# $LH_MIRROR_BOOTSTRAP: set mirror to boostrap from
 +# (Default: http://ftp.us.debian.org/debian/)
 +LH_MIRROR_BOOTSTRAP="http://mirror.webconverger.com/debian"
 +
 +# $LH_MIRROR_CHROOT: set mirror to fetch packages from
 +# (Default: http://ftp.us.debian.org/debian/)
 +LH_MIRROR_CHROOT="http://mirror.webconverger.com/debian"
 +
 +# $LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
 +# (Default: http://security.debian.org/)
 +LH_MIRROR_CHROOT_SECURITY="ftp://mirror.hetzner.de/debian/security"
 +
 +# $LH_MIRROR_BINARY: set mirror which ends up in the image
 +# (Default: http://ftp.us.debian.org/debian/)
 +#LH_MIRROR_BINARY="http://debian.virginmedia.com/"
 +
 +# $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
 +# (Default: http://security.debian.org/)
 +#LH_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
 +
- # $LH_SECTIONS: select section(s) to use
- # (Default: main)
- LH_SECTIONS="main contrib non-free"
++LH_CATEGORIES="main contrib non-free"

-- 
debian-live/config-webc