- fixed proposed size of /boot/zipl on DASDs with GPT (bsc#988526)

package/yast2-storage.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 18 14:54:08 CEST 2016 - aschnell@suse.com
+
+- fixed proposed size of /boot/zipl on DASDs with GPT (bsc#988526)
+- 3.1.96
+
 -------------------------------------------------------------------
 Mon Jul  4 18:07:03 CEST 2016 - shundhammer@suse.de
 

package/yast2-storage.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-storage
-Version:        3.1.95
+Version:        3.1.96
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/modules/StorageProposal.rb

@@ -668,7 +668,7 @@ def try_add_boot(conf, disk, force)
         pb = {}
 	pb["mount"] = Partitions.BootMount
 	pb["size"] = Partitions.ProposedBootsize
-	if disk.fetch("label","")=="gpt" && !Partitions.EfiBoot
+	if disk.fetch("label","")=="gpt" && !Partitions.EfiBoot && !is_dasd?(disk.fetch("device", ""))
 	  sz = disk.fetch("cyl_size",0)-1024
 	  sz = 200*1024 if sz<200*1024
 	  pb["size"] = sz

testsuite/data/Makefile.am

@@ -5,5 +5,5 @@
 SUBDIRS = empty empty-efi half-empty reuse-home windows windows-only		\
 	windows-only-no-resize windows-only-efi empty-s390x empty-ppc64le	\
 	empty-small empty-big empty-big-ppc64le lvm empty-ppc64le-nv            \
-	empty-big-ppc64le-nv
+	empty-big-ppc64le-nv bsc-988526
 

testsuite/data/bsc-988526/Makefile.am

@@ -0,0 +1,6 @@
+#
+# Makefile.am for storage/storage/src/testsuite/data/bsc-988526
+#
+
+EXTRA_DIST = disk_dasda.info arch.info
+

testsuite/data/bsc-988526/arch.info

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<arch>
+  <arch>s390x</arch>
+</arch>

testsuite/data/bsc-988526/disk_dasda.info

@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<disk>
+  <name>dasda</name>
+  <device>/dev/dasda</device>
+  <size_k>10485760</size_k>
+  <major>94</major>
+  <minor>0</minor>
+  <range>4</range>
+  <geometry>
+    <cylinders>10239</cylinders>
+    <heads>16</heads>
+    <sectors>128</sectors>
+  </geometry>
+  <label>gpt</label>
+  <max_primary>3</max_primary>
+  <udev_path>ccw-0.0.ede0</udev_path>
+  <partition>
+    <name>dasda1</name>
+    <device>/dev/dasda1</device>
+    <size_k>8388608</size_k>
+    <major>94</major>
+    <minor>1</minor>
+    <numeric>true</numeric>
+    <number>1</number>
+    <fs_type>btrfs</fs_type>
+    <fs_uuid>89d2a7b0-e2e0-421a-bea0-1795e6dfcfb8</fs_uuid>
+    <mount_by>path</mount_by>
+    <region>
+      <start>1</start>
+      <length>8192</length>
+    </region>
+    <partition_type>primary</partition_type>
+    <partition_id>131</partition_id>
+  </partition>
+  <partition>
+    <name>dasda2</name>
+    <device>/dev/dasda2</device>
+    <size_k>20480</size_k>
+    <major>94</major>
+    <minor>2</minor>
+    <numeric>true</numeric>
+    <number>2</number>
+    <fs_type>ext2</fs_type>
+    <fs_uuid>d2fecbaf-ff3d-44ae-8b7f-4d61a8f5c5ea</fs_uuid>
+    <mount_by>path</mount_by>
+    <region>
+      <start>8193</start>
+      <length>20</length>
+    </region>
+    <partition_type>primary</partition_type>
+    <partition_id>131</partition_id>
+  </partition>
+  <partition>
+    <name>dasda3</name>
+    <device>/dev/dasda3</device>
+    <size_k>2075631</size_k>
+    <major>94</major>
+    <minor>3</minor>
+    <numeric>true</numeric>
+    <number>3</number>
+    <fs_type>swap</fs_type>
+    <fs_uuid>c71167ac-bb2a-4c9d-b9b1-3680381546d0</fs_uuid>
+    <mount_by>path</mount_by>
+    <region>
+      <start>8213</start>
+      <length>2026</length>
+    </region>
+    <partition_type>primary</partition_type>
+    <partition_id>130</partition_id>
+  </partition>
+</disk>

testsuite/tests/bsc-988526.out

@@ -0,0 +1,42 @@
+Dump	Hardware Excerpt:
+Dump	Arch: s390_64
+Dump	
+Dump	Proposal Settings Excerpt:
+Dump	
+Dump	Proposal:
+Dump	Delete partition /dev/dasda1 (8.00 GiB) [destructive]
+Dump	Delete partition /dev/dasda2 (20.00 MiB) [destructive]
+Dump	Delete partition /dev/dasda3 (1.98 GiB) [destructive]
+Dump	Create volume /dev/dasda1 (200.00 MiB) for /boot/zipl with ext2
+Dump	Create swap volume /dev/dasda2 (512.00 MiB)
+Dump	Create root volume /dev/dasda3 (9.30 GiB) with btrfs
+Dump	Create subvolume boot/grub2/s390x-emu on device /dev/dasda3
+Dump	Create subvolume home on device /dev/dasda3
+Dump	Create subvolume opt on device /dev/dasda3
+Dump	Create subvolume srv on device /dev/dasda3
+Dump	Create subvolume tmp on device /dev/dasda3
+Dump	Create subvolume usr/local on device /dev/dasda3
+Dump	Create subvolume var/cache on device /dev/dasda3
+Dump	Create subvolume var/crash on device /dev/dasda3
+Dump	Create subvolume var/lib/libvirt/images on device /dev/dasda3 with option "no copy on write"
+Dump	Create subvolume var/lib/mailman on device /dev/dasda3
+Dump	Create subvolume var/lib/mariadb on device /dev/dasda3 with option "no copy on write"
+Dump	Create subvolume var/lib/mysql on device /dev/dasda3 with option "no copy on write"
+Dump	Create subvolume var/lib/named on device /dev/dasda3
+Dump	Create subvolume var/lib/pgsql on device /dev/dasda3 with option "no copy on write"
+Dump	Create subvolume var/log on device /dev/dasda3
+Dump	Create subvolume var/opt on device /dev/dasda3
+Dump	Create subvolume var/spool on device /dev/dasda3
+Dump	Create subvolume var/tmp on device /dev/dasda3
+Dump	
+Dump	Target Map Excerpt:
+Dump	device:/dev/dasda label:gpt
+Dump	device:/dev/dasda1 delete fsid:0x83
+Dump	device:/dev/dasda2 delete fsid:0x83
+Dump	device:/dev/dasda3 delete fsid:0x82
+Dump	device:/dev/dasda1 fsid:0x83
+Dump	device:/dev/dasda2 fsid:0x82
+Dump	device:/dev/dasda3 fsid:0x83
+Dump	
+Dump	Proposal Feedback:
+Dump	Cound not do snapshots.

testsuite/tests/bsc-988526.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+# testedfiles: helper.rb
+
+module Yast
+
+  class TestClient < Client
+
+    def main
+
+      def setup1()
+        setup_system("bsc-988526")
+      end
+
+      def setup2()
+        ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false)
+        ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false)
+        ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB")
+        ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB")
+        ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true)
+      end
+
+      def setup3()
+      end
+
+      Yast.include self, "helper.rb"
+
+    end
+
+  end
+
+end
+
+Yast::TestClient.new.main