From 6667a008eb1d88bff67fe15020b8ea65772dcc55 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Wed, 19 Oct 2011 14:03:47 +0200
Subject: [PATCH] Yet some other fixes/port from openmamba-milestone2 for dual
 kernel support

---
 platforms/livedvd-root/post.inc.sh | 16 +++++++++-------
 platforms/livedvd/post.inc.sh      |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh
index 3a80b32..1a6b496 100644
--- a/platforms/livedvd-root/post.inc.sh
+++ b/platforms/livedvd-root/post.inc.sh
@@ -56,13 +56,15 @@ for f in /usr/share/applications/chromium-devel.desktop \
 done
 
 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
-[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
-echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
-chroot $MOUNTDIR sh /tmp/sounddb.sh
-rm -f $MOUNTDIR/tmp/sounddb.sh
-[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
+for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
+   [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${K} $MOUNTDIR/lib/modules/`uname -r`
+   echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
+   chroot $MOUNTDIR sh /tmp/sounddb.sh
+   rm -f $MOUNTDIR/tmp/sounddb.sh
+   [ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
 
-# remove unused initramfs generated by kernel
-rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
+   # remove unused initramfs generated by kernel
+   rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
+done
 
 prelink
diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh
index be7218f..cb8ba54 100644
--- a/platforms/livedvd/post.inc.sh
+++ b/platforms/livedvd/post.inc.sh
@@ -64,7 +64,7 @@ done
 
 ISOID=
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
-   cat >> $MOUNTDIR2/boot/isolinux/isolinux/isolinux.cfg << _EOF
+   cat >> $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF
 LABEL vga1024-${KERNEL_MAJVER}${K}
 MENU LABEL VGA 1024x768 no modeset (${KERNEL_MAJVER}${K})
  kernel /boot/vmlinuz${ISOID}