Add libmenu.c32 to isolinux directory

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index cce5a68..b216d90 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -631,11 +631,11 @@ fi
 
 # generate nfsroot configuration for FAI on the fly
 if [ -z "$FAI_DEBOOTSTRAP" ] ; then
 
 # 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
 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
 fi
 
 # create backup of old (not yet automatically generated) config file


@@ -746,6 +746,11 @@ else
          grep 'FAILED with exit code' $CHECKLOG/shell.log >> $LOGFILE && ERROR=6
       fi
 
          grep 'FAILED with exit code' $CHECKLOG/shell.log >> $LOGFILE && ERROR=6
       fi
 

+      if [ -r "$CHECKLOG/fai.log" ] ; then
+        grep 'updatebase.*FAILED with exit code' "$CHECKLOG/fai.log" >> "$LOGFILE" && ERROR=7
+        grep 'instsoft.*FAILED with exit code'   "$CHECKLOG/fai.log" >> "$LOGFILE" && ERROR=8
+      fi
+

       if [ -n "$ERROR" ] ; then
          log    "Error: there was a critical error [${ERROR}] during execution of stage 'fai dirinstall' [$(date)]"
          eerror "Error: there was a critical error during execution of stage 'fai dirinstall'"
       if [ -n "$ERROR" ] ; then
          log    "Error: there was a critical error [${ERROR}] during execution of stage 'fai dirinstall' [$(date)]"
          eerror "Error: there was a critical error during execution of stage 'fai dirinstall'"


@@ -901,6 +906,7 @@ 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 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 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
          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


@@ -937,10 +943,12 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             else
               syslinux_modules_dir=/usr/lib/syslinux
             fi
             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 "${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"
             # make memtest filename FAT16/8.3 compatible
             mv "${BUILD_OUTPUT}/boot/addons/memtest86+.bin" \
               "${BUILD_OUTPUT}/boot/addons/memtest"


@@ -1389,7 +1397,7 @@ else
         fi
       elif [ "$HYBRID_METHOD" = "isohybrid" ] ; then
         if ! which isohybrid >/dev/null 2>&1 ; then
         fi
       elif [ "$HYBRID_METHOD" = "isohybrid" ] ; then
         if ! which isohybrid >/dev/null 2>&1 ; then

-          bailout 12 "isohybrid binary not found - please install syslinux/syslinux-common"
+          bailout 12 "isohybrid binary not found - please install syslinux/syslinux-common/syslinux-utils"

         else
           log   "Creating hybrid ISO file with isohybrid method"
           einfo "Creating hybrid ISO file with isohybrid method"
         else
           log   "Creating hybrid ISO file with isohybrid method"
           einfo "Creating hybrid ISO file with isohybrid method"