Use "newest" kernel only if two kernels are present in the chroot

diff --git a/buildd/functions.sh b/buildd/functions.sh
index 8bdbd1a..c6f91fa 100755 (executable)
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -92,6 +92,8 @@ $ISO_DETAILS
 
 Return code of grml-live run was: $RC
 
 
 Return code of grml-live run was: $RC
 

+$(grep 'Executed command line:' $GRML_LOGFILE || echo "* executed command line not available")
+

 The following errors have been noticed (several might be warnings only):
 
 $(grep -i error $FAI_LOGFILES/* /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error || echo "* nothing")
 The following errors have been noticed (several might be warnings only):
 
 $(grep -i error $FAI_LOGFILES/* /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error || echo "* nothing")


@@ -100,6 +102,10 @@ The following warnings have been noticed:
 
 $(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.std* || echo "* nothing")
 
 
 $(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.std* || echo "* nothing")
 

+The following packages could not be installed:
+
+$(grep -i "Couldn't find.*package" $FAI_LOGFILES/software.log | sed 's/\(.*\)"\(.*\)"\(.*\)/\2/' | sort -u || echo "* nothing")
+

 Find details in the attached logs." | \
   mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \
        -a $ATTACHMENT \
 Find details in the attached logs." | \
   mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \
        -a $ATTACHMENT \

diff --git a/debian/changelog b/debian/changelog
index 040210d..eae56c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ grml-live (0.0.7) unstable; urgency=low
   * Log executed grml-live command line.
   * Set FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
     by default.
   * Log executed grml-live command line.
   * Set FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
     by default.

+  * Use "newest" kernel only if two kernels are present in the chroot.

   * Set $SECONDS to unknown if $start_seconds is not set.
   * Log closing signs (----...) via bailout to make sure they are
     always set - even when exiting with an error.
   * Set $SECONDS to unknown if $start_seconds is not set.
   * Log closing signs (----...) via bailout to make sure they are
     always set - even when exiting with an error.

diff --git a/grml-live b/grml-live
index 1cfafc0..5209776 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -383,7 +383,8 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
          bailout 10
       fi
 
          bailout 10
       fi
 

-      cp "$CHROOT_OUTPUT"/boot/vmlinuz*  "$BUILD_OUTPUT"/boot/isolinux/linux26
+      KERNEL_IMAGE="$(ls $CHROOT_OUTPUT/boot/vmlinuz* | sort -r | head -1)"
+      cp "$KERNEL_IMAGE"                 "$BUILD_OUTPUT"/boot/isolinux/linux26

       cp /usr/lib/syslinux/chain.c32     "$BUILD_OUTPUT"/boot/isolinux/
       cp /usr/lib/syslinux/isolinux.bin  "$BUILD_OUTPUT"/boot/isolinux/
       cp /usr/lib/syslinux/memdisk       "$BUILD_OUTPUT"/boot/isolinux/
       cp /usr/lib/syslinux/chain.c32     "$BUILD_OUTPUT"/boot/isolinux/
       cp /usr/lib/syslinux/isolinux.bin  "$BUILD_OUTPUT"/boot/isolinux/
       cp /usr/lib/syslinux/memdisk       "$BUILD_OUTPUT"/boot/isolinux/