Thu Oct 8 13:52:53 UTC 2009

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24113

Modified Files:
	.cvsignore s390utils.spec sources 
Added Files:
	0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch 
	0002-s390-tools-1.8.1-zipl-automenu.patch 
	0003-s390-tools-1.8.1-fdasd-su.patch 
	0004-s390-tools-1.8.1-fdasd-raid-lvm.patch 
	0005-don-t-create-automenu-when-default-menu-exists.patch 
	0006-s390-tools-1.8.1-zipl-kdump-man.patch 
	0007-s390-tools-1.8.1-lszfcp-perf.patch 
	0008-fix-string-overflow-in-vtoc_volume_label_init.patch 
	0009-change-default-load-address-for-ramdisk.patch 
	0010-improve-mon_statd-init-script.patch 
Removed Files:
	0001-s390-tools-1.8.1-common-mak.patch 
	0004-s390-tools-1.8.1-zipl-automenu.patch 
	0005-s390-tools-1.8.1-fdasd-su.patch 
	0006-s390-tools-1.8.1-fdasd-raid-lvm.patch 
	0008-s390-tools-1.8.1-ziorep-fixes.patch 
	0009-s390-tools-1.8.1-cflags.patch 
	0010-s390-tools-1.8.1-defaultmenu.patch 
	0011-s390-tools-1.8.1-execstack.patch 
	0012-s390-tools-1.8.1-ziomon-fixes.patch 
	0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch 
	0014-s390-tools-1.8.1-zipl-kdump-man.patch 
	0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch 
	0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch 
	0017-s390-tools-1.8.1-cpuplugd-memplug.patch 
	0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch 
	0019-s390-tools-1.8.1-lsluns-disk-enc.patch 
	0020-s390-tools-1.8.1-cpuplugd-cmminit.patch 
	0021-s390-tools-1.8.1-lszfcp-perf.patch 
	0022-fix-string-overflow-in-vtoc_volume_label_init.patch 
	0023-change-default-load-address-for-ramdisk.patch 
	0024-s390-tools-1.8.1-cpuplugd-limits.patch 
	0025-s390-tools-1.8.1-misc-bugfixes.patch 
Log Message:
* Thu Oct  8 2009 Dan Horák <dan[at]danny.cz> 2:1.8.2-1
- added patch for improving mon_statd behaviour
- rebased to 1.8.2


0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch:
 common.mak |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch ---
>From 2b8336a93376953ba0ed84223264be55243ac7f8 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sun, 20 Jul 2008 09:24:05 +0200
Subject: [PATCH 1/9] s390-tools-1.5.3-zipl-zfcpdump-2

---
 common.mak |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mak b/common.mak
index 8b248f1..0a7916e 100644
--- a/common.mak
+++ b/common.mak
@@ -63,8 +63,8 @@ GROUP		= $(shell id -gn)
 export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP
 
 # Special defines for zfcpdump
-ZFCPDUMP_DIR    = /usr/local/share/zfcpdump
-ZFCPDUMP_IMAGE  = zfcpdump.image
+ZFCPDUMP_DIR    = /boot
+ZFCPDUMP_IMAGE  = zfcpdump
 ZFCPDUMP_RD     = zfcpdump.rd
 export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
 
-- 
1.6.3.3


0002-s390-tools-1.8.1-zipl-automenu.patch:
 man/zipl.8 |    7 ++
 src/job.c  |  194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/scan.c |    4 -
 src/zipl.c |    2 
 4 files changed, 197 insertions(+), 10 deletions(-)

--- NEW FILE 0002-s390-tools-1.8.1-zipl-automenu.patch ---
>From 2513c0f8096c681f962d77420dac731f7bb33e44 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:45:36 +0200
Subject: [PATCH 2/9] s390-tools-1.8.1-zipl-automenu

---
 zipl/man/zipl.8 |    7 ++
 zipl/src/job.c  |  194 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 zipl/src/scan.c |    4 +-
 zipl/src/zipl.c |    1 +
 4 files changed, 197 insertions(+), 9 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 8a83c01..6ebf240 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -249,6 +249,13 @@ whether they contain a dump signature or not.
 This option can only be used together with
 .BR \-\-mvdump .
 
+.TP
+.BR "\-x" " or " "\-\-no-automenu"
+Disables the automatic creation of a multiboot menu. Specifying a menu with the
+"-m <MENU>" option or a section disables this feature, too. This option was
+added for compatibility with previous versions of the multiboot version of
+zipl.
+
 .SH EXAMPLE
 1. Scenario: prepare disk for booting a Linux kernel image using the
 following parameters:
diff --git a/zipl/src/job.c b/zipl/src/job.c
index c5c85d8..6a526e4 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -43,6 +43,7 @@ static struct option options[] = {
 	{ "version",		no_argument,		NULL, 'v'},
 	{ "verbose",		no_argument,		NULL, 'V'},
 	{ "add-files",		no_argument,		NULL, 'a'},
+	{ "no-automenu",        no_argument,            NULL, 'x'},
 	{ "tape",		required_argument,	NULL, 'T'},
 	{ "dry-run",		no_argument,		NULL, '0'},
 	{ "force",		no_argument,		NULL, 'f'},
@@ -50,7 +51,7 @@ static struct option options[] = {
 };
 
 /* Command line option abbreviations */
-static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaT:f";
+static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaxT:f";
 
 struct command_line {
 	char* data[SCAN_KEYWORD_NUM];
@@ -62,11 +63,14 @@ struct command_line {
 	int version;
 	int verbose;
 	int add_files;
+	int automenu;
 	int dry_run;
 	int force;
 	enum scan_section_type type;
 };
 
+/* Global variable for default boot target. Ugly but necessary... */
+static char *default_target;
 
 static int
 store_option(struct command_line* cmdline, enum scan_keyword_id keyword,
@@ -92,6 +96,7 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	int i;
 
 	memset((void *) &cmdline, 0, sizeof(struct command_line));
+	cmdline.automenu = 1;
 	cmdline.type = section_invalid;
 	is_keyword = 0;
 	/* Process options */
@@ -101,16 +106,22 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		switch (opt) {
 		case 'd':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumpto,
 					  optarg);
 			break;
 		case 'D':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumptofs,
 					  optarg);
 			break;
 		case 'M':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_mvdump,
 					  optarg);
 #ifndef __s390x__
@@ -121,35 +132,49 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 			break;
 		case 'i':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_image,
 					  optarg);
 			break;
 		case 'P':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parameters,
 					  optarg);
 			break;
 		case 'p':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parmfile,
 					  optarg);
 			break;
 		case 'r':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_ramdisk,
 					  optarg);
 			break;
 		case 's':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_segment,
 					  optarg);
 			break;
 		case 't':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_target,
 					  optarg);
 			break;
 		case 'T':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_tape,
 					  optarg);
 			break;
@@ -190,6 +215,10 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		case 'f':
 			cmdline.force = 1;
 			break;
+		case 'x':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
+			break;
 		case 1:
 			/* Non-option is interpreted as section name */
 			if (cmdline.section != NULL) {
@@ -214,6 +243,9 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	if (cmdline.help || cmdline.version) {
 		/* Always accept --help and --version */
 	} else if ((cmdline.menu != NULL) || (cmdline.section != NULL)) {
+		/* If either menu or section has been selected disable
+		   automenu generation */
+		cmdline.automenu = 0;
 		/* Config file mode */
 		if ((cmdline.menu != NULL) && (cmdline.section != NULL)) {
 			error_reason("Option 'menu' cannot be used when "
@@ -832,7 +864,14 @@ get_job_from_section_data(char* data[], struct job_data* job, char* section)
 		/* IPL job */
 		job->id = job_ipl;
 		/* Fill in name of bootmap directory */
-		job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
+		if (data[(int) scan_keyword_target] == NULL) {
+			if (default_target == NULL) {
+				error_text("Unable to find default section in your config file.");
+				break;
+			}
+			job->bootmap_dir = misc_strdup(default_target);
+		} else
+			job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
 		if (job->bootmap_dir == NULL)
 			return -1;
 		/* Fill in name and address of image file */
@@ -1102,6 +1141,8 @@ get_menu_job(struct scan_token* scan, char* menu, struct job_data* job)
 		if (temp_job == NULL)
 			return -1;
 		memset((void *) temp_job, 0, sizeof(struct job_data));
+		if (data[(int) scan_keyword_target] == NULL)
+			data[(int) scan_keyword_target] = misc_strdup(job->bootmap_dir);
 		rc = get_job_from_section_data(data, temp_job,
 					job->data.menu.entry[current].name);
 		if (rc) {
@@ -1150,6 +1191,7 @@ get_default_section(struct scan_token* scan, char** section, int* is_menu)
 	i = scan_find_section(scan, DEFAULTBOOT_SECTION,
 			      scan_id_section_heading, 0);
 	if (i<0) {
+		*section = NULL;
 		error_reason("No '" DEFAULTBOOT_SECTION "' section found and "
 			     "no section specified on command line");
 		return -1;
@@ -1169,6 +1211,7 @@ get_default_section(struct scan_token* scan, char** section, int* is_menu)
 		}
 	}
 	/* Should not happen */
+	*section = NULL;
 	error_reason("No default section specified");
 	return -1;
 }
@@ -1184,19 +1227,35 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 {
 	char* data[SCAN_KEYWORD_NUM];
 	char* buffer;
+	char* default_section;
 	int rc;
 	int i;
 
+	rc = get_default_section(scan, &default_section, &i);
+	if (rc)
+		return rc;
 	if (section == NULL) {
-		rc = get_default_section(scan, &section, &i);
-		if (rc)
-			return rc;
+		section = default_section;
 		if (i) {
 			/* 'defaultmenu' was specified */
 			rc = get_menu_job(scan, section, job);
 			return rc;
 		}
 	}
+	else
+	{
+		char* name = NULL;
+
+		for (i = 0; (int) scan[i].id != 0; i++) {
+			if (scan[i].id == scan_id_section_heading) {
+				name = scan[i].content.section.name;
+			}
+			if (scan[i].id == scan_id_keyword_assignment &&
+			    scan[i].content.keyword.keyword == scan_keyword_target &&
+			    !strcmp(DEFAULTBOOT_SECTION, name))
+				default_target = misc_strdup(scan[i].content.keyword.value);
+		}
+	}
 	if (strcmp(section, DEFAULTBOOT_SECTION) == 0) {
 		error_reason("Special section '" DEFAULTBOOT_SECTION "' cannot "
 			     "be used as target section");
@@ -1268,10 +1327,118 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 }
 
 
+/* Create a fake menu to simulate the old s390utils-1.1.7 multiboot
+ * behaviour. */
+static struct scan_token *
+create_fake_menu(struct scan_token *scan)
+{
+	int i, j, pos, numsec, size, defaultpos;
+	char *name;
+	char *target;
+	char *timeout;
+	char *seclist[1024];
+	char *defaultsection;
+	char buf[1024];
+	struct scan_token *tmp;
+
+	/* Count # of sections */
+	numsec = 0;
+	name = NULL;
+	target = NULL;
+	timeout = NULL;
+	for (i = 0; (int) scan[i].id != 0; i++) {
+		if (scan[i].id == scan_id_section_heading) {
+			name = scan[i].content.section.name;
+			if (strcmp(DEFAULTBOOT_SECTION, name))
+				seclist[numsec++] = name;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    (scan[i].content.keyword.keyword == scan_keyword_dumpto ||
+		     scan[i].content.keyword.keyword == scan_keyword_dumptofs)) {
+			numsec--;
+			continue;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_target &&
+		    !strcmp(DEFAULTBOOT_SECTION, name))
+			target = scan[i].content.keyword.value;
+
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_timeout)
+			timeout = scan[i].content.keyword.value;
+	}
+	get_default_section(scan, &defaultsection, &j);
+
+	if (defaultsection == NULL) {
+		error_text("Unable to find default section in your config file.");
+		return NULL;
+	}
+
+	if (target == NULL) {
+		error_text("Keyword target is missing in default section.");
+		return NULL;
+	}
+
+	default_target = misc_strdup(target);
+
+	size = i+6+numsec;
+	tmp = (struct scan_token *) misc_malloc(size * sizeof(struct scan_token));
+	if (tmp == NULL) {
+		error_text("Couldn't allocate memory for menu entries");
+		return NULL;
+	}
+
+	memset(tmp, 0, size * sizeof(struct scan_token));
+	memcpy(tmp, scan, i * sizeof(struct scan_token));
+	free(scan);
+	scan = tmp;
+
+	defaultpos = 0;
+	for (j = 0; j < numsec; j++) {
+		if (!strcmp(defaultsection, seclist[j]))
+			defaultpos = j+1;
+	}
+
+	snprintf(buf, 1024, "%d", defaultpos);
+
+	scan[i].id = scan_id_menu_heading;
+	scan[i].line = i;
+	scan[i++].content.menu.name = misc_strdup("rh-automatic-menu");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_target;
+	scan[i++].content.keyword.value = misc_strdup(target);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_default;
+	scan[i++].content.keyword.value = misc_strdup(buf);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_prompt;
+	scan[i++].content.keyword.value = misc_strdup("1");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_timeout;
+	if (timeout)
+		scan[i++].content.keyword.value = misc_strdup(timeout);
+	else
+		scan[i++].content.keyword.value = misc_strdup("15");
+
+	pos = i;
+	for (i = 0; i<numsec; i++) {
+		scan[pos].id = scan_id_number_assignment;
+		scan[pos].line = pos;
+		scan[pos].content.number.number = i+1;
+		scan[pos++].content.number.value = misc_strdup(seclist[i]);
+	}
+
+	return scan;
+}
+
 static int
 get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 {
-	struct scan_token* scan;
+	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
 	int rc;
@@ -1303,9 +1470,22 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 		scan_free(scan);
 		return rc;
 	}
+
+	if (cmdline->automenu) {
+		nscan = create_fake_menu(scan);
+		if (nscan == NULL) {
+			scan_free(scan);
+			return -1;
+		}
+		scan = nscan;
+	}
+
 	/* Get job from config file data */
-	if (cmdline->menu != NULL)
+	if (cmdline->menu != NULL || cmdline->automenu) {
+		if (cmdline->automenu)
+			cmdline->menu = misc_strdup("rh-automatic-menu");
 		rc = get_menu_job(scan, cmdline->menu, job);
+	}
 	else {
 		rc = get_section_job(scan, cmdline->section, job,
 				cmdline->data[(int) scan_keyword_parameters]);
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
index 9948092..caca3cf 100644
--- a/zipl/src/scan.c
+++ b/zipl/src/scan.c
@@ -33,9 +33,9 @@ enum scan_key_state scan_key_table[SCAN_SECTION_NUM][SCAN_KEYWORD_NUM] = {
  *			     rs                                 enu
  */
 /* defaultboot	*/
-	{opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv},
+	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, opt, opt, inv, inv},
 /* ipl		*/
-	{inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv},
+	{inv, inv, inv, req, opt, opt, opt, inv, opt, inv, inv, inv, inv, inv},
 /* segment load */
 	{inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv},
 /* part dump	*/
diff --git a/zipl/src/zipl.c b/zipl/src/zipl.c
index 9cb764c..4d9fd36 100644
--- a/zipl/src/zipl.c
+++ b/zipl/src/zipl.c
@@ -73,6 +73,7 @@ static const char* usage_text[] = {
 "-n, --noninteractive            Answer all confirmation questions with 'yes'",
 "-V, --verbose                   Provide more verbose output",
 "-a, --add-files                 Add all referenced files to bootmap file",
+"-x, --no-automenu               Don't autogenerate multiboot menu",
 "    --dry-run                   Simulate run but don't modify IPL records"
 };
 
-- 
1.6.3.3


0003-s390-tools-1.8.1-fdasd-su.patch:
 fdasd.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE 0003-s390-tools-1.8.1-fdasd-su.patch ---
>From f8acd63e169cdec39c47ac0d8c1b98e115cf24a1 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:46:01 +0200
Subject: [PATCH 3/9] s390-tools-1.8.1-fdasd-su

---
 fdasd/fdasd.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index aa16659..3a54968 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -2009,10 +2009,12 @@ fdasd_get_geometry (fdasd_anchor_t *anc)
 	if (anc->verbose) printf("disk type check     : ok\n");
 
         if (dasd_info.FBA_layout != 0) {
-                snprintf(err_str, ERROR_STRING_SIZE, 
-			"%s is not formatted with z/OS compatible "
-			"disk layout!", options.device);
-                fdasd_error(anc, wrong_disk_format, err_str);
+                if(!anc->silent) {
+                    snprintf(err_str, ERROR_STRING_SIZE,
+			    "%s is not formatted with z/OS compatible "
+			    "disk layout!", options.device);
+                    fdasd_error(anc, wrong_disk_format, err_str);
+                }
         }      
 
 	if (anc->verbose) printf("disk layout check   : ok\n");
-- 
1.6.3.3


0004-s390-tools-1.8.1-fdasd-raid-lvm.patch:
 fdasd.c |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 13 deletions(-)

--- NEW FILE 0004-s390-tools-1.8.1-fdasd-raid-lvm.patch ---
>From 35298f5f9512835071b8c08e843731bbfbb15b7e Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:46:16 +0200
Subject: [PATCH 4/9] s390-tools-1.8.1-fdasd-raid-lvm

---
 fdasd/fdasd.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index 3a54968..a526d7f 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -258,10 +258,10 @@ fdasd_error(fdasd_anchor_t *anc, enum fdasd_failure why, char *str)
 static int
 read_line(void) 
 {
-	bzero(line_buffer, LINE_LENGTH);
 	line_ptr = line_buffer;
         if (!fgets(line_buffer, LINE_LENGTH, stdin))
 		return 0;
+	line_buffer[LINE_LENGTH-1] = 0;
 	while (*line_ptr && !isgraph(*line_ptr))
 		line_ptr++;
 	return *line_ptr;
@@ -312,6 +312,10 @@ fdasd_partition_type (char *str)
 		strcpy(str, "Linux native");
 	else if (strncmp("SWAP  ", str, 6) == 0)
 		strcpy(str, "Linux swap");
+	else if (strncmp("RAID  ", str, 6) == 0)
+		strcpy(str, "Linux Raid");
+	else if (strncmp("LVM   ", str, 6) == 0)
+		strcpy(str, "Linux LVM");
 	else
 		strcpy(str, "unknown");
 
@@ -1122,14 +1126,24 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, s2, 31);
 		}
 		else {
+			char str[20];
 			char *tmp = strstr(ch, "SWAP");
+			char *tmp1 = strstr(ch, "RAID");
 
 			/* create a new data set name */
 			while (getpos(anc, k) > -1)
 				k++;
 
 			setpos(anc, k, i-1);
-			
+
+			strncpy(s2, ch, 44);
+			s2[44]=0;
+			vtoc_ebcdic_dec(s2, s2, 44);
+			c2 = strstr(s2, "PART");
+			if (c2 != NULL) strncpy(str, c2+=9, 6);
+			str[6] = '\0';
+			fdasd_partition_type(str);
+
 			strncpy(ch, "LINUX.V               "
 				"                      ", 44);
 
@@ -1145,10 +1159,21 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, dsno, 4);
 
 			c1 += 4;
-			if (tmp)
-				strncpy(c1, ".SWAP", 5);
-			else
-				strncpy(c1, ".NATIVE", 7);
+			if (tmp || tmp1) {
+				if (tmp)
+					strncpy(c1, ".SWAP", 5);
+				if (tmp1)
+					strncpy(c1, ".RAID", 5);
+			} else {
+				if (strcmp("unknown", str) == 0) {
+					strncpy(c1, ".NATIVE", 7);
+				}
+				else {
+					strncpy(c1, ".", 1);
+					strncpy(c1+1, c2, 6);
+				}
+			}
+
 		}
 		vtoc_ebcdic_enc(ch, ch, 44);
 		if (anc->verbose) printf("%2x ", part_info->f1->DS1FMTID);
@@ -1433,9 +1458,10 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
 
 	printf("current partition type is: %s\n\n", fdasd_partition_type(str));
 	printf("   1  Linux native\n" \
-	       "   2  Linux swap\n\n");
+	       "   2  Linux swap\n" \
+	       "   3  Linux raid\n\n");
 	part_type = 0;
-	while ((part_type < 1) || (part_type > 2)) {
+	while ((part_type < 1) || (part_type > 3)) {
         	while (!isdigit(part_type = 
 				read_char("new partition type: ")));
         	part_type -= 48;
@@ -1448,6 +1474,9 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
         case 2:
 		strncpy(str, "SWAP  ", 6);
                 break;
+        case 3:
+		strncpy(str, "RAID  ", 6);
+                break;
         default:
                 printf("'%d' is not supported!\n", part_type);
         }
@@ -1625,7 +1654,7 @@ fdasd_process_invalid_vtoc(fdasd_anchor_t *anc)
 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;
@@ -1677,14 +1706,26 @@ fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
 			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 "
 				       "in data set name of an existing "
 				       "partition\ndoes not match range of "
 				       "possible partition numbers (1-%d)\n\n",
 				       part_no + 1, USABLE_PARTITIONS);
-			else
-				setpos(anc, part_no, f1_counter);
+			else {
+				if (oldfmt) /* correct +1 */ {
+					setpos(anc, part_no+1, f1_counter);
+					printf("Correcting f1 header number!\n");
+				}
+				else
+					setpos(anc, part_no, f1_counter);
+			}
 
 			part_info = part_info->next;
 			f1_counter++;
-- 
1.6.3.3


0005-don-t-create-automenu-when-default-menu-exists.patch:
 job.c |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

--- NEW FILE 0005-don-t-create-automenu-when-default-menu-exists.patch ---
>From 1efcfe8d7ad20f7a3f584628375da60682b4579c Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 15:28:06 +0200
Subject: [PATCH 5/9] don't create automenu when default menu exists

---
 zipl/src/job.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/zipl/src/job.c b/zipl/src/job.c
index 6a526e4..89c8c23 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -1441,6 +1441,8 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
+	char* default_section;
+	int is_menu;
 	int rc;
 
 	/* Read configuration file */
@@ -1470,20 +1472,23 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 		scan_free(scan);
 		return rc;
 	}
-
-	if (cmdline->automenu) {
-		nscan = create_fake_menu(scan);
-		if (nscan == NULL) {
-			scan_free(scan);
-			return -1;
-		}
-		scan = nscan;
-	}
+	
+	/* disable automenu iff default menu exists */
+	rc = get_default_section(scan, &default_section, &is_menu);
+	if (!rc && is_menu)
+		cmdline->automenu = 0;
 
 	/* Get job from config file data */
 	if (cmdline->menu != NULL || cmdline->automenu) {
-		if (cmdline->automenu)
+		if (cmdline->automenu) {
+			nscan = create_fake_menu(scan);
+			if (nscan == NULL) {
+				scan_free(scan);
+				return -1;
+			}
+			scan = nscan;
 			cmdline->menu = misc_strdup("rh-automatic-menu");
+		}
 		rc = get_menu_job(scan, cmdline->menu, job);
 	}
 	else {
-- 
1.6.3.3


0006-s390-tools-1.8.1-zipl-kdump-man.patch:
 zipl.8 |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0006-s390-tools-1.8.1-zipl-kdump-man.patch ---
>From 894de5382653e4389dc8490f2ee4a2a9c59eb86d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 19 Jun 2009 10:01:30 +0200
Subject: [PATCH 6/9] s390-tools-1.8.1-zipl-kdump-man

Description: Add kdump kernel installation instruction to zipl man page.
Symptom:     User wants to prepare SCSI disk for dump, but has not installed
             the kdump kernel rpm.
Problem:     The installation of the kdump kernel rpm is prereq for preparing
             a SCSI dump disk for dump.
Solution:    Document that in the zipl man page.
---
 zipl/man/zipl.8 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 6ebf240..6df6026 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -176,6 +176,8 @@ will be incomplete.
 It is not possible to specify both this parameter and the name of a menu
 or configuration section on the command line at the same time.
 
+.B Note that before using this option the "kernel-kdump" rpm has to be
+.B installed.
 .TP
 .BR "\-M <DUMPLIST[,SIZE]>" " or " "--mvdump=<DUMPLIST[,SIZE]>"
 Install a multi-volume dump record on each device associated with one of the
-- 
1.6.3.3


0007-s390-tools-1.8.1-lszfcp-perf.patch:
 lszfcp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0007-s390-tools-1.8.1-lszfcp-perf.patch ---
>From 80e1e88e108b774c7aa7c201326f1a92cf1b7e35 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 26 Aug 2009 14:21:14 +0200
Subject: [PATCH 7/9] s390-tools-1.8.1-lszfcp-perf

---
 zconf/lszfcp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zconf/lszfcp b/zconf/lszfcp
index d0bf84f..a872d05 100755
--- a/zconf/lszfcp
+++ b/zconf/lszfcp
@@ -233,7 +233,7 @@ show_devices()
 	# Differentiate old and new sysfs layout
 	if $FC_CLASS; then
 		SCSI_DEVICE_LIST=`ls -d \
-			$SYSFS/devices/css0/*/*/host*/rport*/target*/*/ \
+			$SYSFS/bus/ccw/drivers/zfcp/*/host*/rport*/target*/*/ \
 		       	2>/dev/null |grep -P '\d+:\d+:\d+:\d+'`
 	else
 		SCSI_DEVICE_LIST=`ls -d $SYSFS/devices/css0/*/*/host*/*/`
-- 
1.6.3.3


0008-fix-string-overflow-in-vtoc_volume_label_init.patch:
 vtoc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0008-fix-string-overflow-in-vtoc_volume_label_init.patch ---
>From d0c06736586d8f85f2e7c64291f3f289c12a0caa Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 24 Sep 2009 09:12:39 +0200
Subject: [PATCH 8/9] fix string overflow in vtoc_volume_label_init

Originaly it tries to copy a 84B string into 4B field and reset also
the other fields thru the overflow. This doesn't work with recent GCC
and the security-related compile flags that are used in Fedora.
---
 libvtoc/vtoc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libvtoc/vtoc.c b/libvtoc/vtoc.c
index 62a02a0..cebd5a4 100644
--- a/libvtoc/vtoc.c
+++ b/libvtoc/vtoc.c
@@ -326,7 +326,7 @@ void vtoc_volume_label_init (volume_label_t *vlabel)
 {
 	sprintf(buffer, "%84s", " ");
 	vtoc_ebcdic_enc(buffer, buffer, 84);	
-	strncpy(vlabel->volkey, buffer, 84);
+	memcpy(vlabel, buffer, 84);
 }
 
 
-- 
1.6.3.3


0009-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0009-change-default-load-address-for-ramdisk.patch ---
>From 1697d4f40be133c78cd09fb0af14af22e8c6219e Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sun, 4 Oct 2009 17:46:16 +0200
Subject: [PATCH 9/9] change default load address for ramdisk

The default load address for the initial ramdisk is changed from
0x800000 to 0x2000000 to allow larger kernels to be loaded.
---
 zipl/include/zipl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
index 1f70e48..d2d26dd 100644
--- a/zipl/include/zipl.h
+++ b/zipl/include/zipl.h
@@ -22,7 +22,7 @@
 #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
 #define DEFAULT_STAGE3_ADDRESS		0xa000LL
 #define DEFAULT_IMAGE_ADDRESS		0x10000LL
-#define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
+#define DEFAULT_RAMDISK_ADDRESS 	0x2000000LL
 
 #define PSW_ADDRESS_MASK		0x000000007fffffffLL
 #define PSW_LOAD			0x0008000080000000LL
-- 
1.6.3.3


0010-improve-mon_statd-init-script.patch:
 mon_statd |  114 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 50 deletions(-)

--- NEW FILE 0010-improve-mon_statd-init-script.patch ---
>From 7cd1f2254e27cae8e061d1b42fa6c78bc10a5f39 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 8 Oct 2009 10:29:23 +0200
Subject: [PATCH] improve mon_statd init script

- stop: do not print error messages if a daemon is not configured
- start: do not load module if no daemon is configured
- remove useless newlines
---
 etc/init.d/mon_statd |  113 ++++++++++++++++++++++++++++----------------------
 1 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/etc/init.d/mon_statd b/etc/init.d/mon_statd
index 4d84b5b..60bcf00 100755
--- a/etc/init.d/mon_statd
+++ b/etc/init.d/mon_statd
@@ -22,7 +22,6 @@ PROCD_PATH=/usr/sbin/$PROCD
 CONFIG_FILE=/etc/sysconfig/$DAEMON
 FSSTATD_PID_FILE=/var/run/$FSSTATD.pid
 PROCD_PID_FILE=/var/run/$PROCD.pid
-RETVAL=0
 
 # source function library
 . /lib/lsb/init-functions
@@ -32,68 +31,81 @@ if [ -f $CONFIG_FILE ]; then
 	. $CONFIG_FILE
 fi
 
-start()
+load_kernel_module()
 {
 	if [ ! -e /dev/monwriter ]; then
 		echo "Loading monwriter module..."
 		modprobe monwriter 2>&1
-		if [ "$?" -ne 0 ]; then
+		if [ $? -ne 0 ]; then
+			exit 1
+		fi
+		udevsettle
+		if [ $? -ne 0 ]; then
 			exit 1
 		fi
-		while [ ! -e /dev/monwriter ]; do
-			sleep 0
-		done
 	fi
+}
 
-	if [ ! -f $FSSTATD_PID_FILE -a "$FSSTAT" = "yes" ]; then
-		echo -n $"Starting $FSSTATD:"
-		$FSSTATD_PATH -i $FSSTAT_INTERVAL
-		if [ $? == 0 ]; then
+start_daemon()
+{
+	local daemon_name=$1
+	local daemon_interval=$2
+	local daemon_pid_file=$3
+	local daemon_path=$4
+
+	if [ ! -f $daemon_pid_file ]; then
+		load_kernel_module
+		echo -n "Starting $daemon_name:"
+		$daemon_path -i $daemon_interval
+		if [ $? -eq 0 ]; then
 			touch /var/lock/subsys/mon_statd
 			log_success_msg
 		else
 			log_failure_msg
 		fi
-	elif [ "$FSSTAT" = "yes" ]; then
-		echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE)) is already running..."
+	else
+		echo "$daemon_name (pid $(cat $daemon_pid_file)) is already running..."
+	fi
+}
+	
+start()
+{
+	if [ "$FSSTAT" = "yes" ]; then
+		start_daemon $FSSTATD $FSSTAT_INTERVAL $FSSTATD_PID_FILE \
+			$FSSTATD_PATH
 	fi
 
-	if [ ! -f $PROCD_PID_FILE -a "$PROC" = "yes" ]; then
-		echo -n $"Starting $PROCD:"
-		$PROCD_PATH -i $PROC_INTERVAL
-		if [ $? == 0 ]; then
-			touch /var/lock/subsys/mon_statd
-			log_success_msg
-		else
-			log_failure_msg
-		fi
-	elif [ "$PROC" = "yes" ]; then
-		echo "$PROCD (pid $(cat $PROCD_PID_FILE)) is already running..."
+	if [ "$PROC" = "yes" ]; then
+		start_daemon $PROCD $PROC_INTERVAL $PROCD_PID_FILE \
+			$PROCD_PATH
 	fi
-	echo
 }
 
-stop()
+stop_daemon()
 {
-	echo -n $"Stopping $FSSTATD:"
-	if [ -f $FSSTATD_PID_FILE ]; then
-		killproc $FSSTATD_PATH -TERM
+	local daemon_name=$1
+	local daemon_pid_file=$2
+	local daemon_path=$3
+
+	echo -n "Stopping $daemon_name:"
+	if [ -f $daemon_pid_file ]; then
+		killproc $daemon_path -TERM
 		log_success_msg
-		rm -f $FSSTATD_PID_FILE
+		rm -f $daemon_pid_file
 	else
 		log_failure_msg
 	fi
+}
 
-	echo -n $"Stopping $PROCD:"
-	if [ -f $PROCD_PID_FILE ]; then
-		killproc $PROCD_PATH -TERM
-		log_success_msg
-		rm -f $PROCD_PID_FILE
-	else
-		log_failure_msg
+stop()
+{
+	if [ "$FSSTAT" = "yes" ]; then
+		stop_daemon $FSSTATD $FSSTATD_PID_FILE $FSSTATD_PATH
+	fi
+	if [ "$PROC" = "yes" ]; then
+		stop_daemon $PROCD $PROCD_PID_FILE $PROCD_PATH
 	fi
 	rm -f /var/lock/subsys/mon_statd
-	echo
 }
 
 restart() {
@@ -101,20 +113,23 @@ restart() {
 	start
 }
 
-status()
+status_daemon()
 {
-	if [ ! -f $FSSTATD_PID_FILE ]; then
-		echo "$FSSTATD is not running."
-	else
-		echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE), interval: $FSSTAT_INTERVAL) is running."
-	fi
+	local daemon_name=$1
+	local daemon_pid_file=$2
+	local daemon_interval=$3
 
-	if [ ! -f $PROCD_PID_FILE ]; then
-		echo "$PROCD is not running."
+	if [ ! -f $daemon_pid_file ]; then
+		echo "$daemon_name is not running."
 	else
-		echo "$PROCD (pid $(cat $PROCD_PID_FILE), interval: $PROC_INTERVAL) is running."
+		echo "$daemon_name (pid $(cat $daemon_pid_file), interval: $daemon_interval) is running."
 	fi
-	echo
+}
+
+status()
+{
+	status_daemon $FSSTATD $FSSTATD_PID_FILE $FSSTAT_INTERVAL
+	status_daemon $PROCD $PROCD_PID_FILE $PROC_INTERVAL
 }
 
 # How are we called?
@@ -133,7 +148,7 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $DAEMON {start|stop|status|restart|reload}"
-		RETVAL=1
+		exit 1
 esac
 
-exit $RETVAL
+exit 0
-- 
1.6.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Jul 2009 09:22:09 -0000	1.3
+++ .cvsignore	8 Oct 2009 13:52:51 -0000	1.4
@@ -1,4 +1,4 @@
-s390-tools-1.8.1.tar.bz2
+s390-tools-1.8.2.tar.bz2
 cmsfs-1.1.8c.tar.gz
 lib-zfcp-hbaapi-2.0.tar.gz
 src_vipa-2.0.4.tar.gz


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- s390utils.spec	4 Oct 2009 15:57:11 -0000	1.10
+++ s390utils.spec	8 Oct 2009 13:52:52 -0000	1.11
@@ -7,8 +7,8 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
-Version:        1.8.1
-Release:        8%{?dist}
+Version:        1.8.2
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,28 +27,16 @@ Source8:        dasd.udev
 # http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%{hbaapiver}.html
 Source9:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/lib-zfcp-hbaapi-%{hbaapiver}.tar.gz
 
-Patch1:   0001-s390-tools-1.8.1-common-mak.patch
-Patch4:   0004-s390-tools-1.8.1-zipl-automenu.patch
-Patch5:   0005-s390-tools-1.8.1-fdasd-su.patch
-Patch6:   0006-s390-tools-1.8.1-fdasd-raid-lvm.patch
-Patch8:   0008-s390-tools-1.8.1-ziorep-fixes.patch
-Patch9:   0009-s390-tools-1.8.1-cflags.patch
-Patch10:  0010-s390-tools-1.8.1-defaultmenu.patch
-Patch11:  0011-s390-tools-1.8.1-execstack.patch
-Patch12:  0012-s390-tools-1.8.1-ziomon-fixes.patch
-Patch13:  0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch
-Patch14:  0014-s390-tools-1.8.1-zipl-kdump-man.patch
-Patch15:  0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch
-Patch16:  0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch
-Patch17:  0017-s390-tools-1.8.1-cpuplugd-memplug.patch
-Patch18:  0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch
-Patch19:  0019-s390-tools-1.8.1-lsluns-disk-enc.patch
-Patch20:  0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
-Patch21:  0021-s390-tools-1.8.1-lszfcp-perf.patch
-Patch22:  0022-fix-string-overflow-in-vtoc_volume_label_init.patch
-Patch23:  0023-change-default-load-address-for-ramdisk.patch
-Patch24:  0024-s390-tools-1.8.1-cpuplugd-limits.patch
-Patch25:  0025-s390-tools-1.8.1-misc-bugfixes.patch
+Patch1:   0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch
+Patch2:   0002-s390-tools-1.8.1-zipl-automenu.patch
+Patch3:   0003-s390-tools-1.8.1-fdasd-su.patch
+Patch4:   0004-s390-tools-1.8.1-fdasd-raid-lvm.patch
+Patch5:   0005-don-t-create-automenu-when-default-menu-exists.patch
+Patch6:   0006-s390-tools-1.8.1-zipl-kdump-man.patch
+Patch7:   0007-s390-tools-1.8.1-lszfcp-perf.patch
+Patch8:   0008-fix-string-overflow-in-vtoc_volume_label_init.patch
+Patch9:   0009-change-default-load-address-for-ramdisk.patch
+Patch10:  0010-improve-mon_statd-init-script.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -67,8 +55,8 @@ Requires:       s390utils-cmsfs = %{epoc
 
 
 %description
-This is a meta package for installing all s390-tools sub packages.
-If you do not need all sub packages, it is recommended to install the
+This is a meta package for installing the default s390-tools sub packages.
+If you do not need all default sub packages, it is recommended to install the
 required sub packages separately.
 
 The s390utils packages contain a set of user space utilities that should to
@@ -81,63 +69,31 @@ be used together with the zSeries (s390)
 %patch1 -p1 -b .common-mak
 
 # Patch to maintain backwards compatibility with older zipl multiboot feature
-%patch4 -p1 -b .zipl-automenu
+%patch2 -p1 -b .zipl-automenu
 
 # Fix to honor the silent flag for wrongly formated disks
-%patch5 -p1 -b .fdasd-su
+%patch3 -p1 -b .fdasd-su
 
 # Enhancement to add raid partiton support to dasds
-%patch6 -p1 -b .fdasd-raid-lvm
-
-# Post 1.8.1 fixes for ziorep
-%patch8 -p1 -b .ziorep
-
-# Allow override of optimization level in CFLAGS
-%patch9 -p1 -b .cflags
+%patch4 -p1 -b .fdasd-raid-lvm
 
 # Don't build automenu iff default menu exists (#486444)
-%patch10 -p1 -b .defaultmenu
-
-# Remove the execuatble stack flag from zipl
-%patch11 -p1 -b .execstack
-
-# Post 1.8.1 fixes for ziomon
-%patch12 -p1 -b .ziomon
-
-# Post 1.8.1 fix for zipl
-%patch13 -p1 -b .zipl-device
+%patch5 -p1 -b .defaultmenu
 
 # Update zipl man page
-%patch14 -p1 -b .zipl-kdump-man
-
-# Last-minute fixes from IBM
-%patch15 -p1 -b .iucvterm-getlogin-to-getpwuid
-%patch16 -p1 -b .dumpconf-improve-error-checking
-%patch17 -p1 -b .cpuplugd-memplug
-
-# Adapt ziomon to the new layout of the blkiomon_stat structure (#506966)
-%patch18 -p1 -b .ziomon-new-blkiomon
-
-# Fix byte check for disk encryption check in lsluns (#510032)
-%patch19 -p1 -b .lsluns-disk-enc
-
-# Fix cmm configuration file value initialization parser in cpuplugd (#511379)
-%patch20 -p1 -b .cpuplugd-cmminit
+%patch6 -p1 -b .zipl-kdump-man
 
 # Check only ZFCP devices in lszfcp (#518669)
-%patch21 -p1 -b .lszfcp-perf
+%patch7 -p1 -b .lszfcp-perf
 
 # Fix string overflow in vtoc_volume_label_init (#525318)
-%patch22 -p1 -b .vtoc-label
+%patch8 -p1 -b .vtoc-label
 
 # Change default load address for ramdisk (#526339)
-%patch23 -p1 -b .ramdisk-address
+%patch9 -p1 -b .ramdisk-address
 
-# Fix cmm_pages allocation outside min and max range (#525495)
-%patch24 -p1 -b .ramdisk-address
-
-# Miscelaneous fixes for 1.8.1 (#525495)
-%patch25 -p1 -b .misc
+# Improve mon_statd init script
+%patch10 -p1 -b .improve-mon_statd
 
 #
 # cmsfs
@@ -187,7 +143,7 @@ popd
 
 
 %build
-make OPT_FLAGS="$RPM_OPT_FLAGS" DISTRELEASE=%{release}
+make OPT_FLAGS="$RPM_OPT_FLAGS" DISTRELEASE=%{release} V=1
 
 pushd cmsfs-%{cmsfsver}
 ./configure
@@ -213,7 +169,8 @@ make install \
         INSTROOT=$RPM_BUILD_ROOT \
         MANDIR=$RPM_BUILD_ROOT%{_mandir} \
         LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \
-        DISTRELEASE=%{release}
+        DISTRELEASE=%{release} \
+        V=1
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 mkdir -p ${RPM_BUILD_ROOT}%{_initddir}
@@ -375,19 +332,23 @@ s390 base tools. This collection provide
    * zconf:
      Set of scripts to configure and list status information of Linux for
      zSeries IO devices.
-     - chccwdev: Modify generic attributes of channel attached devices.
-     - lscss:    List channel subsystem devices.
-     - lsdasd:   List channel attached direct access storage devices (DASD).
-     - lsqeth:   List all qeth-based network devices with their corresponding
-                 settings.
-     - lstape:   List tape devices, both channel and FCP attached.
-     - lszfcp:   Shows information contained in sysfs about zfcp adapters,
-                 ports and units that are online.
-     - lschp:    List information about available channel-paths.
-     - chchp:    Modify channel-path state.
-     - lsluns:   List available SCSI LUNs depending on adapter or port.
-     - lszcrypt: Show Information about zcrypt devices and configuration.
-     - chzcrypt: Modify zcrypt configuration.
+     - chccwdev:   Modify generic attributes of channel attached devices.
+     - lscss:      List channel subsystem devices.
+     - lsdasd:     List channel attached direct access storage devices (DASD).
+     - lsqeth:     List all qeth-based network devices with their corresponding
+                   settings.
+     - lstape:     List tape devices, both channel and FCP attached.
+     - lszfcp:     Shows information contained in sysfs about zfcp adapters,
+                   ports and units that are online.
+     - lschp:      List information about available channel-paths.
+     - chchp:      Modify channel-path state.
+     - lsluns:     List available SCSI LUNs depending on adapter or port.
+     - lszcrypt:   Show Information about zcrypt devices and configuration.
+     - chzcrypt:   Modify zcrypt configuration.
+     - znetconf:   List and configure network devices for System z network
+                   adapters.
+     - cio_ignore: Query and modify the contents of the CIO device driver
+                   blacklist.
 
    * dumpconf:
      Allows to configure the dump device used for system dump in case a kernel
@@ -423,7 +384,6 @@ fi
 %defattr(-,root,root,-)
 %doc README
 %doc LICENSE
-/sbin/vmur
 /sbin/zipl
 /sbin/dasdfmt
 /sbin/dasdinfo
@@ -432,6 +392,7 @@ fi
 /sbin/chccwdev
 /sbin/chchp
 /sbin/chzcrypt
+/sbin/cio_ignore
 /sbin/lschp
 /sbin/lscss
 /sbin/lsdasd
@@ -449,6 +410,7 @@ fi
 /sbin/tunedasd
 /sbin/vmcp
 /sbin/zgetdump
+/sbin/znetconf
 /sbin/dbginfo.sh
 %{_sbindir}/lsreipl
 %{_sbindir}/lsshut
@@ -456,10 +418,12 @@ fi
 %{_sbindir}/chshut
 %{_sbindir}/ip_watcher.pl
 %{_sbindir}/start_hsnc.sh
+%{_sbindir}/vmur
 %{_sbindir}/xcec-bridge
 %{_bindir}/vmconvert
 %{_initddir}/dumpconf
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
+/lib/s390-tools
 %{_mandir}/man1/zfcpdbf.1*
 %{_mandir}/man4/prandom.4*
 %{_mandir}/man5/zipl.conf.5*
@@ -468,6 +432,7 @@ fi
 %{_mandir}/man8/chreipl.8*
 %{_mandir}/man8/chshut.8*
 %{_mandir}/man8/chzcrypt.8*
+%{_mandir}/man8/cio_ignore.8*
 %{_mandir}/man8/dasdfmt.8*
 %{_mandir}/man8/dasdinfo.8*
 %{_mandir}/man8/dasdview.8*
@@ -492,6 +457,7 @@ fi
 %{_mandir}/man8/vmcp.8*
 %{_mandir}/man8/vmur.8*
 %{_mandir}/man8/zgetdump.8*
+%{_mandir}/man8/znetconf.8*
 %{_mandir}/man8/zipl.8*
 
 # Additional Redhat specific stuff
@@ -615,18 +581,18 @@ Group:          Applications/System
 Requires:       perl lsscsi coreutils blktrace >= 1.0.1
 
 %description ziomon
-Tool set to collect data for zfcp performance analysis.
+Tool set to collect data for zfcp performance analysis and report.
 
 %files ziomon
 %defattr(-,root,root,-)
-/sbin/ziomon
-/sbin/ziomon_fcpconf
-/sbin/ziomon_mgr
-/sbin/ziomon_util
-/sbin/ziomon_zfcpdd
-/sbin/ziorep_config
-/sbin/ziorep_traffic
-/sbin/ziorep_utilization
+%{_sbindir}/ziomon
+%{_sbindir}/ziomon_fcpconf
+%{_sbindir}/ziomon_mgr
+%{_sbindir}/ziomon_util
+%{_sbindir}/ziomon_zfcpdd
+%{_sbindir}/ziorep_config
+%{_sbindir}/ziorep_traffic
+%{_sbindir}/ziorep_utilization
 %{_mandir}/man8/ziomon.8*
 %{_mandir}/man8/ziomon_fcpconf.8*
 %{_mandir}/man8/ziomon_mgr.8*
@@ -646,7 +612,14 @@ Group:          Applications/System
 BuildRequires:  gettext
 
 %description iucvterm
-z/VM IUCV terminal applications.
+A set of applications to provide terminal access via the z/VM Inter-User
+Communication Vehicle (IUCV). The terminal access does not require an
+active TCP/IP connection between two Linux guest operating systems.
+
+- iucvconn:  Application to establish a terminal connection via z/VM IUCV.
+- iucvtty:   Application to provide terminal access via z/VM IUCV.
+- ts-shell:  Terminal server shell to authorize and control IUCV terminal
+             connections for individual Linux users.
 
 %pre iucvterm
 # check for ts-shell group and create it
@@ -787,6 +760,10 @@ User-space development files for the s39
 
 
 %changelog
+* Thu Oct  8 2009 Dan Horák <dan[at]danny.cz> 2:1.8.2-1
+- added patch for improving mon_statd behaviour
+- rebased to 1.8.2
+
 * Fri Oct  2 2009 Dan Horák <dan[at]danny.cz> 2:1.8.1-8
 - really changed ramdisk load address (#526339)
 - change the required and optional subpackages for the meta package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Jul 2009 09:22:10 -0000	1.3
+++ sources	8 Oct 2009 13:52:52 -0000	1.4
@@ -1,4 +1,4 @@
-6a94c4655204a4ec7a2c64f42c9afed3  s390-tools-1.8.1.tar.bz2
+856ecdd42ad358433eb3fcc886b58a89  s390-tools-1.8.2.tar.bz2
 71a8ee5918f2c44c385fcfe8350cdc98  cmsfs-1.1.8c.tar.gz
 2cbfffca3f07c61420899f45d221d451  lib-zfcp-hbaapi-2.0.tar.gz
 ba42772e5b305b5e147344442cd70826  src_vipa-2.0.4.tar.gz


--- 0001-s390-tools-1.8.1-common-mak.patch DELETED ---


--- 0004-s390-tools-1.8.1-zipl-automenu.patch DELETED ---


--- 0005-s390-tools-1.8.1-fdasd-su.patch DELETED ---


--- 0006-s390-tools-1.8.1-fdasd-raid-lvm.patch DELETED ---


--- 0008-s390-tools-1.8.1-ziorep-fixes.patch DELETED ---


--- 0009-s390-tools-1.8.1-cflags.patch DELETED ---


--- 0010-s390-tools-1.8.1-defaultmenu.patch DELETED ---


--- 0011-s390-tools-1.8.1-execstack.patch DELETED ---


--- 0012-s390-tools-1.8.1-ziomon-fixes.patch DELETED ---


--- 0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch DELETED ---


--- 0014-s390-tools-1.8.1-zipl-kdump-man.patch DELETED ---


--- 0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch DELETED ---


--- 0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch DELETED ---


--- 0017-s390-tools-1.8.1-cpuplugd-memplug.patch DELETED ---


--- 0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch DELETED ---


--- 0019-s390-tools-1.8.1-lsluns-disk-enc.patch DELETED ---


--- 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch DELETED ---


--- 0021-s390-tools-1.8.1-lszfcp-perf.patch DELETED ---


--- 0022-fix-string-overflow-in-vtoc_volume_label_init.patch DELETED ---


--- 0023-change-default-load-address-for-ramdisk.patch DELETED ---


--- 0024-s390-tools-1.8.1-cpuplugd-limits.patch DELETED ---


--- 0025-s390-tools-1.8.1-misc-bugfixes.patch DELETED ---


