Hello community, here is the log from the commit of package s390-tools checked in at Tue Oct 14 19:13:44 CEST 2008. -------- --- arch/s390/s390-tools/s390-tools.changes 2008-10-13 17:45:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/s390-tools/s390-tools.changes 2008-10-14 13:17:26.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 14 13:15:14 CEST 2008 - uli@suse.de + +- restored change in dasdfmt from May 19 that was overwritten + by subsequent checkins (bnc #368595, #434223) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s390-tools.spec ++++++ --- /var/tmp/diff_new_pack.M26171/_old 2008-10-14 19:12:22.000000000 +0200 +++ /var/tmp/diff_new_pack.M26171/_new 2008-10-14 19:12:22.000000000 +0200 @@ -22,7 +22,7 @@ Url: http://www10.software.ibm.com/developerworks/opensource/linux390 Summary: S/390 tools like zipl and dasdfmt Version: 1.8.0 -Release: 7 +Release: 8 PreReq: %insserv_prereq %fillup_prereq License: GPL v2 or later Provides: s390utils:/sbin/dasdfmt @@ -255,6 +255,9 @@ /usr/lib/%{snmp}/agents/osasnmpd %changelog +* Tue Oct 14 2008 uli@suse.de +- restored change in dasdfmt from May 19 that was overwritten + by subsequent checkins (bnc #368595, #434223) * Mon Oct 13 2008 jjolly@suse.de - Updated to 1.8.0 v5 tarball from IBM (bnc#417514) * Thu Oct 09 2008 uli@suse.de ++++++ s390tools-160-pardasdfmt.patch ++++++ --- /var/tmp/diff_new_pack.M26171/_old 2008-10-14 19:12:23.000000000 +0200 +++ /var/tmp/diff_new_pack.M26171/_new 2008-10-14 19:12:23.000000000 +0200 @@ -1,8 +1,6 @@ -Index: s390-tools-1.6.3/dasdfmt/dasdfmt.8 -=================================================================== ---- s390-tools-1.6.3.orig/dasdfmt/dasdfmt.8 -+++ s390-tools-1.6.3/dasdfmt/dasdfmt.8 -@@ -5,9 +5,9 @@ dasdfmt \- formatting of DASD (ECKD) dis +--- s390-tools-1.6.0/dasdfmt/dasdfmt.8 ++++ s390-tools-1.6.0/dasdfmt/dasdfmt.8 +@@ -5,9 +5,9 @@ .SH SYNOPSIS \fBdasdfmt\fR [-h] [-t] [-v] [-y] [-p] [-m \fIstep\fR] .br @@ -14,7 +12,7 @@ .SH DESCRIPTION \fBdasdfmt\fR formats a DASD (ECKD) disk drive to prepare it -@@ -71,6 +71,11 @@ first two tracks of the volume. This ena +@@ -71,6 +71,11 @@ operating systems to access this device (e.g. for backup purposes). .TP @@ -26,7 +24,7 @@ \fB-p\fR or \fB--progressbar\fR Print a progress bar while formatting. Do not use this option if you are using a 3270 console, -@@ -89,6 +94,20 @@ Specify blocksize to be used. \fIblksize +@@ -89,6 +94,20 @@ and always be a power of two. The recommended blocksize is 4096 bytes. .TP @@ -47,10 +45,8 @@ \fB-l\fR \fIvolser\fR or \fB--label\fR=\fIvolser\fR Specify the volume serial number or volume identifier to be written to disk after formatting. If no label is specified, a sensible default -Index: s390-tools-1.6.3/dasdfmt/dasdfmt.c -=================================================================== ---- s390-tools-1.6.3.orig/dasdfmt/dasdfmt.c -+++ s390-tools-1.6.3/dasdfmt/dasdfmt.c +--- s390-tools-1.6.0/dasdfmt/dasdfmt.c ++++ s390-tools-1.6.0/dasdfmt/dasdfmt.c @@ -15,6 +15,7 @@ #include "zt_common.h" #include "dasdfmt.h" @@ -59,7 +55,7 @@ /* Full tool name */ static const char tool_name[] = "dasdfmt: zSeries DASD format program"; -@@ -113,32 +114,35 @@ static void program_interrupt_signal (in +@@ -113,32 +114,35 @@ /* * check given device name for blanks and some special characters @@ -118,7 +114,7 @@ if ((strchr(name, ' ') != NULL)||(strchr(name, '#') != NULL)|| (strchr(name, '[') != NULL)||(strchr(name, ']') != NULL)|| (strchr(name, '!') != NULL)||(strchr(name, '>') != NULL)|| -@@ -149,9 +153,38 @@ static void get_device_name(dasdfmt_info +@@ -149,9 +153,38 @@ "blanks or special characters!\n", prog_name); @@ -159,7 +155,7 @@ } -@@ -175,7 +208,6 @@ static void init_info(dasdfmt_info_t *in +@@ -175,7 +208,6 @@ info->cdl_format = 0; info->blksize_specified = 0; info->node_specified = 0; @@ -167,7 +163,7 @@ info->device_id = 0; info->keep_volser = 0; } -@@ -217,16 +249,9 @@ static void check_disk(dasdfmt_info_t *i +@@ -217,16 +249,9 @@ info->usage_count = dasd_info.open_count; info->devno = dasd_info.devno; if (strncmp(dasd_info.type, "ECKD",4) != 0) { @@ -184,7 +180,7 @@ } } -@@ -344,10 +369,7 @@ static void dasdfmt_print_info(dasdfmt_i +@@ -344,10 +369,7 @@ (drive_geo->cylinders * drive_geo->heads)); printf("\nI am going to format the device "); @@ -196,7 +192,7 @@ printf(" Device number of device : 0x%x\n",info->devno); printf(" Labelling device : %s\n", -@@ -559,7 +581,7 @@ static void dasdfmt_format(dasdfmt_info_ +@@ -559,7 +581,7 @@ info->hashstep = 10; } @@ -205,7 +201,7 @@ info->hashstep); } -@@ -568,7 +590,7 @@ static void dasdfmt_format(dasdfmt_info_ +@@ -568,7 +590,7 @@ k = 0; cyl = 1; @@ -214,7 +210,7 @@ printf("\n"); while (1) { -@@ -606,7 +628,7 @@ static void dasdfmt_format(dasdfmt_info_ +@@ -606,7 +628,7 @@ if (info->print_hashmarks) if (cyl % info->hashstep == 0) { @@ -223,7 +219,7 @@ fflush(stdout); } -@@ -621,7 +643,7 @@ static void dasdfmt_format(dasdfmt_info_ +@@ -621,7 +643,7 @@ break; } @@ -232,7 +228,7 @@ printf("\n\n"); } -@@ -745,18 +767,18 @@ static void do_format_dasd(dasdfmt_info_ +@@ -745,18 +767,18 @@ dasdfmt_prepare_and_format(info, &drive_geo, p); @@ -254,7 +250,7 @@ } } -@@ -767,7 +789,8 @@ int main(int argc,char *argv[]) +@@ -767,7 +789,8 @@ volume_label_t vlabel; char old_volser[7]; @@ -264,7 +260,7 @@ char str[ERR_LENGTH]; char buf[7]; -@@ -775,7 +798,10 @@ int main(int argc,char *argv[]) +@@ -775,7 +798,10 @@ char *blksize_param_str = NULL; char *hashstep_str = NULL; @@ -276,7 +272,7 @@ /* Establish a handler for interrupt signals. */ signal (SIGTERM, program_interrupt_signal); -@@ -887,14 +913,19 @@ int main(int argc,char *argv[]) +@@ -887,14 +913,19 @@ break; case 'n' : @@ -301,7 +297,7 @@ case 'k' : info.keep_volser=1; break; -@@ -914,53 +945,115 @@ int main(int argc,char *argv[]) +@@ -914,53 +945,124 @@ CHECK_SPEC_MAX_ONCE(info.labelspec, "label"); CHECK_SPEC_MAX_ONCE(info.writenolabel, "omit-label-writing flag"); @@ -315,7 +311,15 @@ - PARSE_PARAM_INTO(info.hashstep, hashstep_str,10,"hashstep"); - - get_device_name(&info, dev_filename, argc, argv); -- ++ while(info.device_id < argc) { /* devices specified at the end of cmdline */ ++ if(dev_count>=MAX_DEVICES) ++ ERRMSG_EXIT(EXIT_MISUSE,"%s: too many devices specified.\n", ++ prog_name); ++ dev_filename[dev_count++]=strdup(argv[info.device_id]); ++ info.node_specified=1; ++ info.device_id++; ++ } + - if (!info.blksize_specified) - format_params = ask_user_for_blksize(format_params); + if (info.node_specified == 0) @@ -452,11 +456,9 @@ return 0; } -Index: s390-tools-1.6.3/dasdfmt/dasdfmt.h -=================================================================== ---- s390-tools-1.6.3.orig/dasdfmt/dasdfmt.h -+++ s390-tools-1.6.3/dasdfmt/dasdfmt.h -@@ -130,6 +130,7 @@ struct hd_geometry { +--- s390-tools-1.6.0/dasdfmt/dasdfmt.h ++++ s390-tools-1.6.0/dasdfmt/dasdfmt.h +@@ -130,6 +130,7 @@ #define LABEL_LENGTH 14 #define VLABEL_CHARS 84 #define LINE_LENGTH 80 @@ -464,7 +466,7 @@ #define ERR_LENGTH 80 #define DEFAULT_BLOCKSIZE 4096 -@@ -147,7 +148,7 @@ struct hd_geometry { +@@ -147,7 +148,7 @@ if (*endptr) ERRMSG_EXIT(EXIT_MISUSE,"%s: " str " " \ "is in invalid format\n",prog_name);} @@ -473,7 +475,7 @@ static struct option dasdfmt_getopt_long_options[]= { -@@ -163,6 +164,8 @@ static struct option dasdfmt_getopt_long +@@ -163,6 +164,8 @@ { "device", 1, 0, 'f'}, { "blocksize", 1, 0, 'b'}, { "help", 0, 0, 'h'}, @@ -482,7 +484,7 @@ { "keep_volser", 0, 0, 'k'}, {0, 0, 0, 0} }; -@@ -198,9 +201,10 @@ typedef struct dasdfmt_info { +@@ -198,9 +201,10 @@ int cdl_format; int blksize_specified; int node_specified; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de