SVN: livecd/mklive/mklive

[shadzik]

Author: shadzik
Date: Mon Aug  9 19:03:28 2010
New Revision: 11772

Modified:
   livecd/mklive/mklive
Log:
- copy kernel-desktop if installed, otherwise fallback to standard kernel, in fact both kernels are copied if both are installed


Modified: livecd/mklive/mklive
==============================================================================
--- livecd/mklive/mklive	(original)
+++ livecd/mklive/mklive	Mon Aug  9 19:03:28 2010
@@ -222,7 +222,8 @@
 cp -r $mkroot/$templatesDir/isolinux $tmp_iso_root
 
 cp -r $mkroot/$templatesDir/boot $tmp_iso_root
-cp $sys_source/boot/vmlinuz $tmp_iso_root/boot
+[ -f $sys_source/boot/vmlinuz-desktop ] && cp $sys_source/boot/vmlinuz-desktop $tmp_iso_root/boot
+[ -f $sys_source/boot/vmlinuz ] && cp $sys_source/boot/vmlinuz $tmp_iso_root/boot
 
 # create initrd
 create_initrd $sys_source $tmp_iso_root/boot/initrd.img || die "Creating initrd image failed."