|
 |
16aa69 |
From 34a70a8041862757b951fb25fa060386c9c7db0e Mon Sep 17 00:00:00 2001
|
|
|
16aa69 |
From: Robert Marshall <rmarshall@redhat.com>
|
|
|
16aa69 |
Date: Tue, 14 Mar 2017 22:39:20 -0400
|
|
|
16aa69 |
Subject: [PATCH 74/75] Add s390/s390x set-default-index test (#1285601)
|
|
|
16aa69 |
|
|
|
16aa69 |
Adds a test to ensure set-default-index actually works for s390 and
|
|
|
16aa69 |
s390x platforms.
|
|
|
16aa69 |
|
|
|
16aa69 |
Related: rhbz#1285601
|
|
|
16aa69 |
---
|
|
|
16aa69 |
test.sh | 2 ++
|
|
|
16aa69 |
test/results/default/z2.1 | 22 ++++++++++++++++++++++
|
|
|
16aa69 |
2 files changed, 24 insertions(+)
|
|
|
16aa69 |
create mode 100644 test/results/default/z2.1
|
|
|
16aa69 |
|
|
|
16aa69 |
diff --git a/test.sh b/test.sh
|
|
|
16aa69 |
index 34ba4d7..7225c9f 100755
|
|
|
16aa69 |
--- a/test.sh
|
|
|
16aa69 |
+++ b/test.sh
|
|
|
16aa69 |
@@ -314,6 +314,8 @@ liloDisplayTest lilo.1 defaultkernel/l1.1 --default-kernel
|
|
|
16aa69 |
testing="Z/IPL default directive"
|
|
|
16aa69 |
ziplTest zipl.1 default/z1.1 --add-kernel /boot/new-kernel --title test
|
|
|
16aa69 |
ziplTest zipl.1 default/z1.2 --add-kernel /boot/new-kernel --title test --make-default
|
|
|
16aa69 |
+testing="Z/IPL default index directive"
|
|
|
16aa69 |
+ziplTest zipl.2 default/z2.1 --set-default-index=0
|
|
|
16aa69 |
testing="Z/IPL display default index"
|
|
|
16aa69 |
ziplDisplayTest zipl.1 defaultindex/0 --default-index
|
|
|
16aa69 |
testing="Z/IPL display default title"
|
|
|
16aa69 |
diff --git a/test/results/default/z2.1 b/test/results/default/z2.1
|
|
|
16aa69 |
new file mode 100644
|
|
|
16aa69 |
index 0000000..93e7491
|
|
|
16aa69 |
--- /dev/null
|
|
|
16aa69 |
+++ b/test/results/default/z2.1
|
|
|
16aa69 |
@@ -0,0 +1,22 @@
|
|
|
16aa69 |
+[defaultboot]
|
|
|
16aa69 |
+defaultauto
|
|
|
16aa69 |
+prompt=1
|
|
|
16aa69 |
+timeout=5
|
|
|
16aa69 |
+default=3.10.0-514.6.2.el7.s390x
|
|
|
16aa69 |
+target=/boot
|
|
|
16aa69 |
+[3.10.0-514.6.2.el7.s390x]
|
|
|
16aa69 |
+ image=/boot/vmlinuz-3.10.0-514.6.2.el7.s390x
|
|
|
16aa69 |
+ 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"
|
|
|
16aa69 |
+ ramdisk=/boot/initramfs-3.10.0-514.6.2.el7.s390x.img
|
|
|
16aa69 |
+[3.10.0-514.6.2.el7.s390x_with_debugging]
|
|
|
16aa69 |
+ image=/boot/vmlinuz-3.10.0-514.6.2.el7.s390x
|
|
|
16aa69 |
+ 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"
|
|
|
16aa69 |
+ ramdisk=/boot/initramfs-3.10.0-514.6.2.el7.s390x.img
|
|
|
16aa69 |
+[linux]
|
|
|
16aa69 |
+ image=/boot/vmlinuz-3.10.0-514.el7.s390x
|
|
|
16aa69 |
+ ramdisk=/boot/initramfs-3.10.0-514.el7.s390x.img
|
|
|
16aa69 |
+ 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"
|
|
|
16aa69 |
+[linux-0-rescue-196fd0394b7442a6838686745f03fd04]
|
|
|
16aa69 |
+ image=/boot/vmlinuz-0-rescue-196fd0394b7442a6838686745f03fd04
|
|
|
16aa69 |
+ ramdisk=/boot/initramfs-0-rescue-196fd0394b7442a6838686745f03fd04.img
|
|
|
16aa69 |
+ 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"
|
|
|
16aa69 |
--
|
|
|
16aa69 |
2.9.3
|
|
|
16aa69 |
|