X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=20b8191347fa2f50df2a2788d8cdaa0f1dc05f75;hp=90f64385454cf33b7a07de5633e2879e7b6ec751;hb=50857d888a8e6c3cafd740b5f4acec23422a2411;hpb=038aa8ee761d650f999fcf486fe7d95e5a27d47a

diff --git a/grml-live b/grml-live
index 90f6438..20b8191 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
@@ -906,6 +906,8 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
          copy_addon_file ifcpu64.c32  /usr/lib/syslinux/modules/bios/ isolinux
          copy_addon_file ldlinux.c32  /usr/lib/syslinux/modules/bios/ isolinux
          copy_addon_file libcom32.c32 /usr/lib/syslinux/modules/bios/ isolinux
+         copy_addon_file libgpl.c32   /usr/lib/syslinux/modules/bios/ isolinux
+         copy_addon_file libmenu.c32  /usr/lib/syslinux/modules/bios/ isolinux
          copy_addon_file libutil.c32  /usr/lib/syslinux/modules/bios/ isolinux
          copy_addon_file vesamenu.c32 /usr/lib/syslinux/modules/bios/ isolinux
        else # syslinux versions <= 3:4.05+dfsg-6+deb8u1
@@ -942,10 +944,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"