Magellan Linux

Diff of /trunk/grubby/test.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2682 by niro, Mon Oct 21 14:01:48 2013 UTC revision 2683 by niro, Wed Jul 16 09:51:14 2014 UTC
# Line 536  if [ "$testgrub2" == "y" ]; then Line 536  if [ "$testgrub2" == "y" ]; then
536    
537      testing="GRUB2 --default-index with default=saved_entry and empty grubenv"      testing="GRUB2 --default-index with default=saved_entry and empty grubenv"
538      grub2DisplayTest grub2.8 defaultindex/0 --env grubenv.0 --default-index      grub2DisplayTest grub2.8 defaultindex/0 --env grubenv.0 --default-index
539    
540        testlinux16=n
541        case $ARCH in
542            ia32|x86_64) testlinux16=y ;;
543        esac
544    
545        if [ "$testlinux16" == "y" ]; then
546            testing="GRUB2 add kernel with linux16"
547            grub2Test grub2.10 add/g2-1.10 --add-kernel=/boot/new-kernel.img \
548                --title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
549                --copy-default
550    
551            testing="GRUB2 add initrd with linux16"
552            grub2Test grub2.11 add/g2-1.11 --update-kernel=/boot/new-kernel.img \
553                --initrd=/boot/new-initrd --boot-filesystem=/boot/
554        fi
555  fi  fi
556    
557  testing="YABOOT add kernel"  testing="YABOOT add kernel"

Legend:
Removed from v.2682  
changed lines
  Added in v.2683