SVN: livecd/mklive/mklive

[shadzik]

Author: shadzik
Date: Mon Aug  9 19:16:00 2010
New Revision: 11775

Modified:
   livecd/mklive/mklive
Log:
- make kernel selection conditional, so if kernel-desktop is found, it's taken else the standard kernel is taken


Modified: livecd/mklive/mklive
==============================================================================
--- livecd/mklive/mklive	(original)
+++ livecd/mklive/mklive	Mon Aug  9 19:16:00 2010
@@ -222,8 +222,11 @@
 cp -r $mkroot/$templatesDir/isolinux $tmp_iso_root
 
 cp -r $mkroot/$templatesDir/boot $tmp_iso_root
-[ -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
+if [ -f $sys_source/boot/vmlinuz-desktop ]; then
+       	cp $sys_source/boot/vmlinuz-desktop $tmp_iso_root/boot/vmlinuz
+elif [ -f $sys_source/boot/vmlinuz ]; then
+       	cp $sys_source/boot/vmlinuz $tmp_iso_root/boot
+fi
 
 # create initrd
 create_initrd $sys_source $tmp_iso_root/boot/initrd.img || die "Creating initrd image failed."