X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=150ada2cf554815838dc8d5af2f3481747bd3f15;hp=90f64385454cf33b7a07de5633e2879e7b6ec751;hb=96dd50bc39ed1093afa12ed48b327f9773243b12;hpb=038aa8ee761d650f999fcf486fe7d95e5a27d47a diff --git a/grml-live b/grml-live index 90f6438..150ada2 100755 --- a/grml-live +++ b/grml-live @@ -631,11 +631,11 @@ fi # generate nfsroot configuration for FAI on the fly if [ -z "$FAI_DEBOOTSTRAP" ] ; then - FAI_DEBOOTSTRAP="$SUITE http://http.debian.net/debian" + FAI_DEBOOTSTRAP="$SUITE http://ftp.debian.org/debian" fi if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then - FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --arch $ARCH" + FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --include=aptitude --arch $ARCH" fi # create backup of old (not yet automatically generated) config file @@ -942,10 +942,12 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then else syslinux_modules_dir=/usr/lib/syslinux fi - for file in memdisk chain.c32 hdt.c32 mboot.c32 menu.c32; do + for file in chain.c32 hdt.c32 mboot.c32 menu.c32; do copy_addon_file "${file}" "${syslinux_modules_dir}" addons done + copy_addon_file memdisk /usr/lib/syslinux addons + # make memtest filename FAT16/8.3 compatible mv "${BUILD_OUTPUT}/boot/addons/memtest86+.bin" \ "${BUILD_OUTPUT}/boot/addons/memtest"