Attachment 311617 Details for Bug 455077 – Backport to RHEL 4

[patch] Backport to RHEL 4

s390-tools-1.3.2-zipl_timeout.patch (text/plain), 1.62 KB, created by Brad Hinson on 2008-07-11 20:32:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Hinson

Created: 2008-07-11 20:32:23 UTC

Size: 1.62 KB

patch

obsolete

>--- s390-tools-1.3.2/zipl/src/scan.c.orig
>+++ s390-tools-1.3.2/zipl/src/scan.c
>@@ -33,7 +33,7 @@
>  *			     rs                                 enu
>  */
> /* defaultboot	*/
>-	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, inv, opt, inv},
>+	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, opt, opt, inv},
> /* ipl		*/
> 	{inv, inv, inv, req, opt, opt, opt, inv, opt, inv, inv, inv, inv},
> /* segment load */
>--- s390-tools-1.3.2/zipl/src/job.c.orig
>+++ s390-tools-1.3.2/zipl/src/job.c
>@@ -1198,6 +1198,7 @@
> 	int i, j, pos, numsec, size, defaultpos;
> 	char *name;
> 	char *target;
>+	char *timeout;
> 	char *seclist[1024];
> 	char *defaultsection;
> 	char buf[1024];
>@@ -1207,6 +1208,7 @@
> 	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;
>@@ -1223,6 +1225,10 @@
> 		    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);
> 
>@@ -1276,7 +1282,10 @@
> 	scan[i].id = scan_id_keyword_assignment;
> 	scan[i].line = i;
> 	scan[i].content.keyword.keyword = scan_keyword_timeout;
>-	scan[i++].content.keyword.value = misc_strdup("15");
>+	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++) {

Actions: View | Diff

Attachments on bug 455077: 311617