Hello community, here is the log from the commit of package s390-tools for openSUSE:Factory checked in at 2013-08-05 20:54:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s390-tools (Old) and /work/SRC/openSUSE:Factory/.s390-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s390-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/s390-tools/s390-tools.changes 2013-08-01 16:04:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.s390-tools.new/s390-tools.changes 2013-08-05 20:54:49.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 2 18:38:31 UTC 2013 - [email protected] + +- Updated s390tools-160-pardasdfmt.patch and + s390-tools-sles11sp2-dasdfmt-percentage-conflict.patch to be the + same as current. For some reason, they didn't get updated properly + with the last update. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s390-tools-sles11sp2-dasdfmt-percentage-conflict.patch ++++++ --- /var/tmp/diff_new_pack.cc9STH/_old 2013-08-05 20:54:50.000000000 +0200 +++ /var/tmp/diff_new_pack.cc9STH/_new 2013-08-05 20:54:50.000000000 +0200 @@ -24,6 +24,15 @@ =================================================================== --- s390-tools-1.15.0.orig/dasdfmt/dasdfmt.c +++ s390-tools-1.15.0/dasdfmt/dasdfmt.c +@@ -44,7 +44,7 @@ print_version (void) + */ + static void exit_usage(int exitcode) + { +- printf("Usage: %s [-htvypPLVFk]\n" ++ printf("Usage: %s [-htvypQLVFk]\n" + " [-l <volser> | --label=<volser>]\n" + " [-b <blocksize> | --blocksize=<blocksize>]\n" + " [-d <disk layout> | --disk_layout=<disk layout>]\n" @@ -54,7 +54,7 @@ static void exit_usage(int exitcode) " -V or --version means print version\n" " -L or --no_label means don't write disk label\n" ++++++ s390tools-160-pardasdfmt.patch ++++++ --- /var/tmp/diff_new_pack.cc9STH/_old 2013-08-05 20:54:51.000000000 +0200 +++ /var/tmp/diff_new_pack.cc9STH/_new 2013-08-05 20:54:51.000000000 +0200 @@ -296,7 +296,7 @@ case 'k' : info.keep_volser=1; break; -@@ -1008,53 +1044,127 @@ int main(int argc,char *argv[]) +@@ -1008,53 +1044,139 @@ int main(int argc,char *argv[]) CHECK_SPEC_MAX_ONCE(info.labelspec, "label"); CHECK_SPEC_MAX_ONCE(info.writenolabel, "omit-label-writing flag"); @@ -342,8 +342,11 @@ + } + + if(info.yast_mode) { -+ struct hd_geometry drive_geo; + for(i=0;i<dev_count;i++) { ++ dasd_information_t dasd_info; ++ struct dasd_eckd_characteristics *characteristics; ++ unsigned int cylinders; ++ + get_device_name(&info, dev_filename[i],argc,argv); + if ((filedes = open(info.devname, O_RDWR)) == -1) { + ERRMSG("%s: Unable to open device %s: %s\n", @@ -352,16 +355,25 @@ + dev_filename[i]=(char*)-1; /* ignore device */ + continue; + } -+ if (ioctl(filedes, HDIO_GETGEO, &drive_geo) != 0) { -+ ERRMSG("%s: the ioctl call to get geometry " -+ "returned with the following error message:\n%s\n", -+ prog_name, strerror(errno)); ++ if (ioctl(filedes, BIODASDINFO, &dasd_info) != 0) { ++ ERRMSG_EXIT(EXIT_FAILURE, "%s: (retrieving disk information) " ++ "IOCTL BIODASDINFO failed (%s).\n", ++ prog_name, strerror(errno)); + free(dev_filename[i]); + dev_filename[i]=(char*)-1; /* ignore device */ + close(filedes); + continue; -+ } -+ printf("%d\n",drive_geo.cylinders); ++ } ++ ++ characteristics = ++ (struct dasd_eckd_characteristics *) &dasd_info.characteristics; ++ if (characteristics->no_cyl == LV_COMPAT_CYL && ++ characteristics->long_no_cyl) ++ cylinders = characteristics->long_no_cyl; ++ else ++ cylinders = characteristics->no_cyl; ++ ++ printf("%d\n", cylinders); + close(filedes); } - -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
