|
 |
16aa69 |
From f99b2809835f78ebb613899b7bf71c097b3bb91f Mon Sep 17 00:00:00 2001
|
|
|
16aa69 |
From: Peter Jones <pjones@redhat.com>
|
|
|
16aa69 |
Date: Tue, 17 Mar 2015 14:50:35 -0400
|
|
|
16aa69 |
Subject: [PATCH 30/41] Actually get the test from a7800d8f right.
|
|
|
16aa69 |
|
|
|
16aa69 |
Woops.
|
|
|
16aa69 |
|
|
|
16aa69 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
16aa69 |
---
|
|
|
16aa69 |
test.sh | 2 +-
|
|
|
16aa69 |
test/grub2.15 | 2 +-
|
|
|
16aa69 |
test/results/add/g2-1.14 | 6 +++---
|
|
|
16aa69 |
test/results/add/g2-1.15 | 6 +++---
|
|
|
16aa69 |
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
16aa69 |
|
|
|
16aa69 |
diff --git a/test.sh b/test.sh
|
|
|
16aa69 |
index 3cfb965..fb13033 100755
|
|
|
16aa69 |
--- a/test.sh
|
|
|
16aa69 |
+++ b/test.sh
|
|
|
16aa69 |
@@ -515,7 +515,7 @@ if [ "$testgrub2" == "y" ]; then
|
|
|
16aa69 |
--add-kernel=/boot/vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 \
|
|
|
16aa69 |
--initrd /boot/initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img \
|
|
|
16aa69 |
--copy-default --title "Fedora 21 Rescue" --args=root=/fooooo \
|
|
|
16aa69 |
- --remove-kernel=wtf --boot-filesystem=/boot/
|
|
|
16aa69 |
+ --remove-kernel=wtf --boot-filesystem=/boot/ --efi
|
|
|
16aa69 |
|
|
|
16aa69 |
testing="GRUB2 add initrd"
|
|
|
16aa69 |
grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \
|
|
|
16aa69 |
diff --git a/test/grub2.15 b/test/grub2.15
|
|
|
16aa69 |
index b7e7c16..ab0c2f8 100644
|
|
|
16aa69 |
--- a/test/grub2.15
|
|
|
16aa69 |
+++ b/test/grub2.15
|
|
|
16aa69 |
@@ -81,7 +81,7 @@ menuentry 'Fedora, with Linux 3.15.0-0.rc5.git2.10.fc21.x86_64' --class fedora -
|
|
|
16aa69 |
else
|
|
|
16aa69 |
search --no-floppy --fs-uuid --set=root 6169b46f-0257-4319-b2e4-caaed2a8e06b
|
|
|
16aa69 |
fi
|
|
|
16aa69 |
- linux /vmlinuz-3.15.0-0.rc5.git2.10.fc21.x86_64 root=/dev/mapper/fedora_uefi-root ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
+ linuxefi /vmlinuz-3.15.0-0.rc5.git2.10.fc21.x86_64 root=/dev/mapper/fedora_uefi-root ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
}
|
|
|
16aa69 |
|
|
|
16aa69 |
### END /etc/grub.d/10_linux ###
|
|
|
16aa69 |
diff --git a/test/results/add/g2-1.14 b/test/results/add/g2-1.14
|
|
|
16aa69 |
index 68b2d2b..0865bbc 100644
|
|
|
16aa69 |
--- a/test/results/add/g2-1.14
|
|
|
16aa69 |
+++ b/test/results/add/g2-1.14
|
|
|
16aa69 |
@@ -81,8 +81,8 @@ menuentry 'Fedora 21 Rescue' --class fedora --class gnu-linux --class gnu --clas
|
|
|
16aa69 |
else
|
|
|
16aa69 |
search --no-floppy --fs-uuid --set=root 6169b46f-0257-4319-b2e4-caaed2a8e06b
|
|
|
16aa69 |
fi
|
|
|
16aa69 |
- linux /vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 root=/fooooo ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
- initrd /initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img
|
|
|
16aa69 |
+ linux16 /vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 root=/fooooo ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
+ initrd16 /initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img
|
|
|
16aa69 |
}
|
|
|
16aa69 |
menuentry 'Fedora, with Linux 3.15.0-0.rc5.git2.10.fc21.x86_64' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.15.0-0.rc5.git2.10.fc21.x86_64-advanced-a14e3dcb-ade3-42f7-832f-d9f66b5ae6a3' {
|
|
|
16aa69 |
load_video
|
|
|
16aa69 |
@@ -96,7 +96,7 @@ menuentry 'Fedora, with Linux 3.15.0-0.rc5.git2.10.fc21.x86_64' --class fedora -
|
|
|
16aa69 |
else
|
|
|
16aa69 |
search --no-floppy --fs-uuid --set=root 6169b46f-0257-4319-b2e4-caaed2a8e06b
|
|
|
16aa69 |
fi
|
|
|
16aa69 |
- linux /vmlinuz-3.15.0-0.rc5.git2.10.fc21.x86_64 root=/dev/mapper/fedora_uefi-root ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
+ linux16 /vmlinuz-3.15.0-0.rc5.git2.10.fc21.x86_64 root=/dev/mapper/fedora_uefi-root ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
}
|
|
|
16aa69 |
|
|
|
16aa69 |
### END /etc/grub.d/10_linux ###
|
|
|
16aa69 |
diff --git a/test/results/add/g2-1.15 b/test/results/add/g2-1.15
|
|
|
16aa69 |
index 0865bbc..b67c373 100644
|
|
|
16aa69 |
--- a/test/results/add/g2-1.15
|
|
|
16aa69 |
+++ b/test/results/add/g2-1.15
|
|
|
16aa69 |
@@ -81,8 +81,8 @@ menuentry 'Fedora 21 Rescue' --class fedora --class gnu-linux --class gnu --clas
|
|
|
16aa69 |
else
|
|
|
16aa69 |
search --no-floppy --fs-uuid --set=root 6169b46f-0257-4319-b2e4-caaed2a8e06b
|
|
|
16aa69 |
fi
|
|
|
16aa69 |
- linux16 /vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 root=/fooooo ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
- initrd16 /initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img
|
|
|
16aa69 |
+ linuxefi /vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 root=/fooooo ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
+ initrdefi /initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img
|
|
|
16aa69 |
}
|
|
|
16aa69 |
menuentry 'Fedora, with Linux 3.15.0-0.rc5.git2.10.fc21.x86_64' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.15.0-0.rc5.git2.10.fc21.x86_64-advanced-a14e3dcb-ade3-42f7-832f-d9f66b5ae6a3' {
|
|
|
16aa69 |
load_video
|
|
|
16aa69 |
@@ -96,7 +96,7 @@ menuentry 'Fedora, with Linux 3.15.0-0.rc5.git2.10.fc21.x86_64' --class fedora -
|
|
|
16aa69 |
else
|
|
|
16aa69 |
search --no-floppy --fs-uuid --set=root 6169b46f-0257-4319-b2e4-caaed2a8e06b
|
|
|
16aa69 |
fi
|
|
|
16aa69 |
- linux16 /vmlinuz-3.15.0-0.rc5.git2.10.fc21.x86_64 root=/dev/mapper/fedora_uefi-root ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
+ linuxefi /vmlinuz-3.15.0-0.rc5.git2.10.fc21.x86_64 root=/dev/mapper/fedora_uefi-root ro rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
|
|
|
16aa69 |
}
|
|
|
16aa69 |
|
|
|
16aa69 |
### END /etc/grub.d/10_linux ###
|
|
|
16aa69 |
--
|
|
|
16aa69 |
2.4.3
|
|
|
16aa69 |
|