rpms/s390utils/devel s390-tools-1.5.0-fdasd-raid.patch, 1.1, 1.2 s390utils.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: pknirsch

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26908

Modified Files:
	s390-tools-1.5.0-fdasd-raid.patch s390utils.spec 
Log Message:
- Fixed problem with s390-tools-1.5.0-fdasd-raid.patch


s390-tools-1.5.0-fdasd-raid.patch:
 fdasd.c |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 10 deletions(-)

Index: s390-tools-1.5.0-fdasd-raid.patch
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390-tools-1.5.0-fdasd-raid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s390-tools-1.5.0-fdasd-raid.patch	21 Oct 2005 09:54:26 -0000	1.1
+++ s390-tools-1.5.0-fdasd-raid.patch	30 Jan 2006 17:15:48 -0000	1.2
@@ -1,5 +1,5 @@
---- s390-tools-1.5.0/fdasd/fdasd.c.fdasd-raid	2005-10-20 09:22:40.000000000 +0200
-+++ s390-tools-1.5.0/fdasd/fdasd.c	2005-10-20 09:34:03.000000000 +0200
+--- s390-tools-1.5.0/fdasd/fdasd.c.fdasd-raid	2006-01-30 17:32:11.000000000 +0100
++++ s390-tools-1.5.0/fdasd/fdasd.c	2006-01-30 18:13:40.000000000 +0100
 @@ -215,10 +215,10 @@
  static int
  read_line(void) 
@@ -88,11 +88,25 @@
          default:
                  printf("'%d' is not supported!\n", part_type);
          }
-@@ -1541,14 +1564,21 @@
+@@ -1506,7 +1529,7 @@
+ static void
+ fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
+ {
+-	int f1_counter = 0, f7_counter = 0, f5_counter = 0;
++	int f1_counter = 0, f7_counter = 0, f5_counter = 0, oldfmt = 0;
+ 	int i, part_no, f1_size = sizeof(format1_label_t);
+ 	partition_info_t *part_info = anc->first;
+ 	format1_label_t f1_label;
+@@ -1541,14 +1564,26 @@
  			vtoc_ebcdic_enc(part_info->f1->DS1DSNAM,
  					part_info->f1->DS1DSNAM, 44);
  
 -			if ((part_no < 0) || (part_no >= USABLE_PARTITIONS))
++			/* this dasd has data set names 0000-0002
++                           but we use now 0001-0003 */
++                        if (part_no == -1)
++                                oldfmt++;
++
 +			if (((oldfmt == 0) && (part_no < 0))
 +			    || (part_no >= USABLE_PARTITIONS))
  				printf("WARNING: partition number (%i) found "


Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- s390utils.spec	27 Jan 2006 11:11:25 -0000	1.29
+++ s390utils.spec	30 Jan 2006 17:15:48 -0000	1.30
@@ -145,7 +145,10 @@
 %{_mandir}/man5/*
 
 %changelog
-* Thu Jan 26 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.0-2
+* Mon Jan 30 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.0-2
+- Fixed problem with s390-tools-1.5.0-fdasd-raid.patch
+
+* Thu Jan 26 2006 Phil Knirsch <pknirsch at redhat.com>
 - Fixed some .macro errors in zipl/boot
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>