diff options
| author | Andreas Loibl <aloibl@dasajuma.(none)> | 2010-09-02 14:14:09 +0200 |
|---|---|---|
| committer | Andreas Loibl <aloibl@dasajuma.(none)> | 2010-09-02 14:14:09 +0200 |
| commit | 54fdeef9a550267f86324bb31ff421c33772b5ae (patch) | |
| tree | fa1dece9049b5c0da4e0db20c7474bba1bcfc389 | |
| parent | ac01112bf3d3b5f8cfcc3f1d753181481102d0ff (diff) | |
| download | kanotix-54fdeef9a550267f86324bb31ff421c33772b5ae.zip kanotix-54fdeef9a550267f86324bb31ff421c33772b5ae.tar.gz | |
rearranged "lh config" calls
| -rwxr-xr-x | auto/config | 55 |
1 files changed, 21 insertions, 34 deletions
diff --git a/auto/config b/auto/config index 3d83e19..bb49901 100755 --- a/auto/config +++ b/auto/config @@ -1,39 +1,10 @@ #!/bin/sh -DEFAULT_CHROOT=http://ftp.de.debian.org/debian -DEFAULT_CHROOT_SECURITY=http://security.debian.org/ -DEFAULT_BINARY=http://ftp.de.debian.org/debian -DEFAULT_BINARY_SECURITY=http://security.debian.org/ - -MIRROR_CHROOT="${1:-$DEFAULT_CHROOT}" -MIRROR_CHROOT_SECURITY="${2:-$DEFAULT_CHROOT_SECURITY}" -MIRROR_BINARY="${3:-${1:-$DEFAULT_BINARY}}" -MIRROR_BINARY_SECURITY="${4:-${2:-$DEFAULT_BINARY_SECURITY}}" -MIRROR_BOOTSTRAP="${5:-${1:-$DEFAULT_CHROOT}}" - -if test "$MIRROR_CHROOT" = -; then - MIRROR_CHROOT="$DEFAULT_CHROOT" -fi -if test "$MIRROR_CHROOT_SECURITY" = -; then - MIRROR_CHROOT_SECURITY="$DEFAULT_CHROOT_SECURITY" -fi -if test "$MIRROR_BINARY" = -; then - MIRROR_BINARY="$DEFAULT_BINARY" -fi -if test "$MIRROR_BINARY_SECURITY" = -; then - MIRROR_BINARY_SECURITY="$DEFAULT_BINARY_SECURITY" -fi -if test "$MIRROR_BOOTSTRAP" = -; then - MIRROR_BOOTSTRAP="$DEFAULT_CHROOT" -fi - -# kernel -#lh config noauto \ -# --linux-flavours generic \ -# --linux-packages "linux-image-2.6.32-21 linux-headers-2.6.32-21" -lh config noauto \ - --linux-flavours 686-bigmem \ - --linux-packages "linux-headers-2.6-686-bigmem" +MIRROR_CHROOT=http://ftp.de.debian.org/debian +MIRROR_CHROOT_SECURITY=http://security.debian.org/ +MIRROR_BINARY=http://ftp.de.debian.org/debian +MIRROR_BINARY_SECURITY=http://security.debian.org/ +MIRROR_BOOTSTRAP="$MIRROR_CHROOT" lh config noauto \ --iso-volume KANOTIX \ @@ -65,6 +36,22 @@ lh config noauto \ --packages-lists "standard-x11" \ ${@} +. config/bootstrap + +# architecture depending stuff (e.g. kernel) +case $LH_ARCHITECTURE in +"amd64") + lh config noauto \ + --linux-flavours amd64 \ + --linux-packages "linux-headers-2.6-amd64" + ;; +"i368") + lh config noauto \ + --linux-flavours 686-bigmem \ + --linux-packages "linux-headers-2.6-686-bigmem" + ;; +esac + # Fetch kanotix-scripts if necessary mkdir -p config/chroot_local-includes/usr/local/bin grep -oe '^[^ #]*' scripts.urls | wget -i- -c -N -q -P config/chroot_local-includes/usr/local/bin |