Magellan Linux

Diff of /trunk/grubby/test.sh

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

revision 2971 by niro, Thu Jun 30 10:06:57 2016 UTC revision 2980 by niro, Thu Jun 30 10:26:25 2016 UTC
# Line 269  grubTest grub.13 setdefaultindex/g.13.0 Line 269  grubTest grub.13 setdefaultindex/g.13.0
269  grubTest grub.13 setdefaultindex/g.13.1 --set-default-index=1  grubTest grub.13 setdefaultindex/g.13.1 --set-default-index=1
270  grubTest grub.13 setdefaultindex/g.13.9 --set-default-index=9  grubTest grub.13 setdefaultindex/g.13.9 --set-default-index=9
271    
272    testing="GRUB add initrd"
273    grubTest grub.14 add/g1.7 --boot-filesystem=/ --update-kernel=/vmlinuz-4.0.0-0.rc4.git1.4.fc23.x86_64 --initrd /initramfs-4.0.0-0.rc4.git1.4.fc23.x86_64.img '--args= LANG=en_US.UTF-8' '--title=Fedora (4.0.0-0.rc4.git1.4.fc23.x86_64) 23 (Rawhide)'
274    
275  testing="GRUB display default index"  testing="GRUB display default index"
276  grubDisplayTest grub.1 defaultindex/0 --default-index  grubDisplayTest grub.1 defaultindex/0 --default-index
277  grubDisplayTest grub.2 defaultindex/0 --default-index  grubDisplayTest grub.2 defaultindex/0 --default-index
# Line 527  if [ "$testgrub2" == "y" ]; then Line 530  if [ "$testgrub2" == "y" ]; then
530          --add-kernel=/boot/vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 \          --add-kernel=/boot/vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 \
531          --initrd /boot/initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img \          --initrd /boot/initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img \
532          --copy-default --title "Fedora 21 Rescue" --args=root=/fooooo \          --copy-default --title "Fedora 21 Rescue" --args=root=/fooooo \
533          --remove-kernel=wtf --boot-filesystem=/boot/          --remove-kernel=wtf --boot-filesystem=/boot/ --efi
534    
535      testing="GRUB2 add initrd"      testing="GRUB2 add initrd"
536      grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \      grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \
# Line 664  extlinuxTest extlinux.5 add/extlinux5.1 Line 667  extlinuxTest extlinux.5 add/extlinux5.1
667      --initrd=/boot/initramfs-3.15.0-0.rc1.git4.1.fc21.armv7hl.img \      --initrd=/boot/initramfs-3.15.0-0.rc1.git4.1.fc21.armv7hl.img \
668      --boot-filesystem=/boot --copy-default \      --boot-filesystem=/boot --copy-default \
669      --title="Fedora (3.15.0-0.rc1.git4.1.fc21.armv7hl) 21 (Rawhide)" \      --title="Fedora (3.15.0-0.rc1.git4.1.fc21.armv7hl) 21 (Rawhide)" \
670        --remove-kernel="TITLE=Fedora (3.12.0-0.fc21.armv7hl) 21 (Rawhide)"
671    extlinuxTest extlinux.6 add/extlinux6.1 \
672        --add-kernel=/boot/vmlinuz-3.15.0-0.rc1.git4.1.fc21.armv7hl \
673        --devtreedir='/boot/dtb-3.15.0-0.rc1.git4.1.fc21.armv7hl/' \
674        --initrd=/boot/initramfs-3.15.0-0.rc1.git4.1.fc21.armv7hl.img \
675        --boot-filesystem=/boot --copy-default \
676        --title="Fedora (3.15.0-0.rc1.git4.1.fc21.armv7hl) 21 (Rawhide)" \
677      --remove-kernel="TITLE=Fedora (3.12.0-0.fc21.armv7hl) 21 (Rawhide)"      --remove-kernel="TITLE=Fedora (3.12.0-0.fc21.armv7hl) 21 (Rawhide)"
678    
679  testing="LILO long titles"  testing="LILO long titles"

Legend:
Removed from v.2971  
changed lines
  Added in v.2980