|
 |
903092 |
From 70e36b1a4e67a162c44a692bcde6bec6b6bdc9ee Mon Sep 17 00:00:00 2001
|
|
|
903092 |
From: Robert Marshall <rmarshall@redhat.com>
|
|
|
903092 |
Date: Tue, 14 Mar 2017 22:55:27 -0400
|
|
|
903092 |
Subject: [PATCH 72/75] Add s390/s390x --info test (#1285601)
|
|
|
903092 |
|
|
|
903092 |
Running the --info grubby option on s390/s390x platforms always returned
|
|
|
903092 |
the (null) value. Added a test to look at --info and ensure it comes out
|
|
|
903092 |
as a user would expect.
|
|
|
903092 |
|
|
|
903092 |
Resolves: rhbz#1285601
|
|
|
903092 |
---
|
|
|
903092 |
test.sh | 2 ++
|
|
|
903092 |
test/results/info/z2.1 | 6 ++++++
|
|
|
903092 |
test/zipl.2 | 22 ++++++++++++++++++++++
|
|
|
903092 |
3 files changed, 30 insertions(+)
|
|
|
903092 |
create mode 100644 test/results/info/z2.1
|
|
|
903092 |
create mode 100644 test/zipl.2
|
|
|
903092 |
|
|
|
903092 |
diff --git a/test.sh b/test.sh
|
|
|
903092 |
index 3631ed0..34ba4d7 100755
|
|
|
903092 |
--- a/test.sh
|
|
|
903092 |
+++ b/test.sh
|
|
|
903092 |
@@ -320,6 +320,8 @@ testing="Z/IPL display default title"
|
|
|
903092 |
ziplDisplayTest zipl.1 defaulttitle/z.1 --default-title
|
|
|
903092 |
testing="Z/IPL display default kernel"
|
|
|
903092 |
ziplDisplayTest zipl.1 defaultkernel/z.1 --default-kernel
|
|
|
903092 |
+testing="Z/IPL display entry information"
|
|
|
903092 |
+ziplDisplayTest zipl.2 info/z2.1 --info=1
|
|
|
903092 |
|
|
|
903092 |
testing="GRUB fallback directive"
|
|
|
903092 |
grubTest grub.5 fallback/g5.1 --remove-kernel=/boot/vmlinuz-2.4.7-ac3 \
|
|
|
903092 |
diff --git a/test/results/info/z2.1 b/test/results/info/z2.1
|
|
|
903092 |
new file mode 100644
|
|
|
903092 |
index 0000000..e5ce3a1
|
|
|
903092 |
--- /dev/null
|
|
|
903092 |
+++ b/test/results/info/z2.1
|
|
|
903092 |
@@ -0,0 +1,6 @@
|
|
|
903092 |
+index=1
|
|
|
903092 |
+kernel=/boot/vmlinuz-3.10.0-514.6.2.el7.s390x
|
|
|
903092 |
+args="crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0 LANG=en_US.UTF-8 systemd.log_level=debug systemd.log_target=kmsg"
|
|
|
903092 |
+root=/dev/mapper/rhel_ibm--z--68-root
|
|
|
903092 |
+initrd=/boot/initramfs-3.10.0-514.6.2.el7.s390x.img
|
|
|
903092 |
+title=3.10.0-514.6.2.el7.s390x_with_debugging
|
|
|
903092 |
diff --git a/test/zipl.2 b/test/zipl.2
|
|
|
903092 |
new file mode 100644
|
|
|
903092 |
index 0000000..f064b2a
|
|
|
903092 |
--- /dev/null
|
|
|
903092 |
+++ b/test/zipl.2
|
|
|
903092 |
@@ -0,0 +1,22 @@
|
|
|
903092 |
+[defaultboot]
|
|
|
903092 |
+defaultauto
|
|
|
903092 |
+prompt=1
|
|
|
903092 |
+timeout=5
|
|
|
903092 |
+default=3.10.0-514.6.2.el7.s390x_with_debugging
|
|
|
903092 |
+target=/boot
|
|
|
903092 |
+[3.10.0-514.6.2.el7.s390x]
|
|
|
903092 |
+ image=/boot/vmlinuz-3.10.0-514.6.2.el7.s390x
|
|
|
903092 |
+ parameters="root=/dev/mapper/rhel_ibm--z--68-root crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0 LANG=en_US.UTF-8"
|
|
|
903092 |
+ ramdisk=/boot/initramfs-3.10.0-514.6.2.el7.s390x.img
|
|
|
903092 |
+[3.10.0-514.6.2.el7.s390x_with_debugging]
|
|
|
903092 |
+ image=/boot/vmlinuz-3.10.0-514.6.2.el7.s390x
|
|
|
903092 |
+ parameters="root=/dev/mapper/rhel_ibm--z--68-root crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0 LANG=en_US.UTF-8 systemd.log_level=debug systemd.log_target=kmsg"
|
|
|
903092 |
+ ramdisk=/boot/initramfs-3.10.0-514.6.2.el7.s390x.img
|
|
|
903092 |
+[linux]
|
|
|
903092 |
+ image=/boot/vmlinuz-3.10.0-514.el7.s390x
|
|
|
903092 |
+ ramdisk=/boot/initramfs-3.10.0-514.el7.s390x.img
|
|
|
903092 |
+ parameters="root=/dev/mapper/rhel_ibm--z--68-root crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0 LANG=en_US.UTF-8"
|
|
|
903092 |
+[linux-0-rescue-196fd0394b7442a6838686745f03fd04]
|
|
|
903092 |
+ image=/boot/vmlinuz-0-rescue-196fd0394b7442a6838686745f03fd04
|
|
|
903092 |
+ ramdisk=/boot/initramfs-0-rescue-196fd0394b7442a6838686745f03fd04.img
|
|
|
903092 |
+ parameters="root=/dev/mapper/rhel_ibm--z--68-root crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0"
|
|
|
903092 |
--
|
|
|
903092 |
2.9.3
|
|
|
903092 |
|