diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2011-09-23 11:16:22 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2011-09-23 11:16:22 +0200 |
| commit | 097f1d44ce8da48ca61dac8d2fa2363fe48c1e6b (patch) | |
| tree | 9c78f8488d8abf95cc6375b5798937398627cb75 /scripts/build/lb_binary_debian-installer | |
| parent | 2e73ac04b782972c1dbf35b21c4fbb198d6fa0ba (diff) | |
| parent | f8c765ea228f87733d86875eabaff0b7de780d74 (diff) | |
| download | live-build-097f1d44ce8da48ca61dac8d2fa2363fe48c1e6b.zip live-build-097f1d44ce8da48ca61dac8d2fa2363fe48c1e6b.tar.gz | |
Merge branch 'debian-old-2.0' into burg
Diffstat (limited to 'scripts/build/lb_binary_debian-installer')
| -rwxr-xr-x | scripts/build/lb_binary_debian-installer | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index ee7bb64..f6769cf 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -231,36 +231,7 @@ then LB_DEBIAN_INSTALLER_DISTRIBUTION="sid" # Debian Installer daily builds - case "${LB_ARCHITECTURE}" in - alpha|amd64|hppa|ia64|mips|mipsel|powerpc) - URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURE}/daily/" - ;; - - arm|armel) - URL="http://people.debian.org/~kmuto/d-i/images/daily/" - ;; - - i386) - URL="http://people.debian.org/~joeyh/d-i/images/daily/" - ;; - - m68k) - URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/" - ;; - - s390) - URL="http://lophos.multibuild.org/d-i/images/daily/" - ;; - - sparc) - URL="http://people.debian.org/~stappers/d-i/images/daily/" - ;; - - *) - Echo_error "No daily-builds found for your architecture." - exit 1 - ;; - esac + URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURE}/daily/" else URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURE}/current/images/" fi @@ -323,8 +294,7 @@ then case "${LB_ARCHITECTURE}" in amd64) - #DI_REQ_PACKAGES="lilo grub grub2" - DI_REQ_PACKAGES="lilo grub" + DI_REQ_PACKAGES="lilo grub grub-pc" case "${LB_MODE}" in ubuntu) @@ -338,8 +308,7 @@ then ;; i386) - #DI_REQ_PACKAGES="elilo lilo grub grub2" - DI_REQ_PACKAGES="elilo lilo grub" + DI_REQ_PACKAGES="elilo lilo grub grub-pc" case "${LB_MODE}" in ubuntu) @@ -379,7 +348,7 @@ then ;; esac - DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup lvm2" + DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2" case "${LB_MODE}" in debian) |