Bug 30512

Description jkh 2001-09-11 21:50:04 UTC

 Whoops!  You're right, fixed, thanks!
 
 - Jordan
 
 From: Alan Judge <Alan.Judge@eircom.net>
 Subject: STABLE sysinstall scripted installs broken since 2001/08/31
 Date: Tue, 11 Sep 2001 11:56:12 +0100 (IST)
 
 > 
 > >Submitter-Id:	current-users
 > >Originator:	Alan Judge
 > >Organization:	eircom.net
 > >Confidential:	no
 > >Synopsis:	STABLE sysinstall scripted installs broken since 2001/08/31
 > >Severity:	critical
 > >Priority:	medium
 > >Category:	bin
 > >Class:		sw-bug
 > >Release:	FreeBSD 4.4-RC i386
 > >Environment:
 > System: FreeBSD brazil.eng.eircom.net 4.4-BRAZIL-0.62-BETA FreeBSD 4.4-BRAZIL-0.62-BETA #0: Thu Sep 6 13:35:07 GMT 2001 judgea@brazil.eng.eircom.net:/usr/src/sys/compile/BRAZIL-DEV-SMP i386
 > 
 > 	Tracking RELENG_4 and building custom releases for production
 > 	environment.
 > 
 > >Description:
 > 	A recent patch to release/sysinstall/msg.c by jkh has broken scripted
 > 	installs.  I think the comments in msg.c are wrong leading to the wrong
 > 	code being committed for non-interactive installs.
 > 
 > 	It seems msgYesNo follows the dialog DITEM_SUCCESS/FAILURE model and
 > 	returns 0 for success and 1 for failure.
 > 
 > >How-To-Repeat:
 > 	Attempt a scripted install using a config file.
 > 	installCommit fails quickly.
 > 
 > >Fix:
 > 
 > 	Patch below against STABLE.
 > 
 > 	I'm building a new test release now, but given the approaching
 > 	release thought it best to file rapidly so this can be
 > 	fixed before 4.4 ships.  I'll followup to the PR once I've
 > 	tested my new CD.
 > 
 > 	I'd request an immediate commit to STABLE if this looks ok.
 > 
 > Index: release/sysinstall/msg.c
 > ===================================================================
 > RCS file: /f5/misc/FreeBSD/cvs/src/release/sysinstall/Attic/msg.c,v
 > retrieving revision 1.52.2.3
 > diff -u -r1.52.2.3 msg.c
 > --- msg.c	2001/08/31 19:43:56	1.52.2.3
 > +++ msg.c	2001/09/11 10:33:55
 > @@ -218,7 +218,7 @@
 >      dialog_msgbox(NULL, errstr, -1, -1, 0);
 >  }
 >  
 > -/* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
 > +/* Put up a message in a popup yes/no box and return 0 for YES, 1 for NO */
 >  int
 >  msgYesNo(char *fmt, ...)
 >  {
 > @@ -238,13 +238,13 @@
 >  	msgInfo(NULL);
 >      }
 >      if (variable_get(VAR_NONINTERACTIVE))
 > -	return 1;	/* If non-interactive, return YES all the time */
 > +	return 0;	/* If non-interactive, return YES all the time */
 >      ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
 >      restorescr(w);
 >      return ret;
 >  }
 >  
 > -/* Put up a message in a popup no/yes box and return 1 for YES, 0 for NO */
 > +/* Put up a message in a popup no/yes box and return 0 for YES, 1 for NO */
 >  int
 >  msgNoYes(char *fmt, ...)
 >  {
 > @@ -264,7 +264,7 @@
 >  	msgInfo(NULL);
 >      }
 >      if (variable_get(VAR_NONINTERACTIVE))
 > -	return 0;	/* If non-interactive, return NO all the time */
 > +	return 1;	/* If non-interactive, return NO all the time */
 >      ret = dialog_noyes("User Confirmation Requested", errstr, -1, -1);
 >      restorescr(w);
 >      return ret;