Index: initdb.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/initdb/initdb.c,v
retrieving revision 1.103
diff -c -r1.103 initdb.c
*** initdb.c	31 Dec 2005 23:50:59 -0000	1.103
--- initdb.c	2 Jan 2006 00:52:58 -0000
***************
*** 1122,1128 ****
  				status,
  				test_conns,
  				test_buffs,
! 				test_max_fsm;
  
  	printf(_("selecting default max_connections ... "));
  	fflush(stdout);
--- 1122,1130 ----
  				status,
  				test_conns,
  				test_buffs,
! 		        test_max_fsm,
!         		ok_buffers = 0;
! 	  
  
  	printf(_("selecting default max_connections ... "));
  	fflush(stdout);
***************
*** 1144,1150 ****
--- 1146,1155 ----
  				 DEVNULL, DEVNULL, SYSTEMQUOTE);
  		status = system(cmd);
  		if (status == 0)
+ 		{
+ 			ok_buffers = test_buffs;
  			break;
+ 		}
  	}
  	if (i >= connslen)
  		i = connslen - 1;
***************
*** 1158,1163 ****
--- 1163,1173 ----
  	for (i = 0; i < bufslen; i++)
  	{
  		test_buffs = trial_bufs[i];
+ 		if (test_buffs <= ok_buffers)
+ 		{
+ 			test_buffs = ok_buffers;
+ 			break;
+ 		}
  		test_max_fsm = FSM_FOR_BUFS(test_buffs);
  
  		snprintf(cmd, sizeof(cmd),
***************
*** 1173,1181 ****
  		if (status == 0)
  			break;
  	}
! 	if (i >= bufslen)
! 		i = bufslen - 1;
! 	n_buffers = trial_bufs[i];
  	n_fsm_pages = FSM_FOR_BUFS(n_buffers);
  
  	printf("%d/%d\n", n_buffers, n_fsm_pages);
--- 1183,1189 ----
  		if (status == 0)
  			break;
  	}
! 	n_buffers = test_buffs;
  	n_fsm_pages = FSM_FOR_BUFS(n_buffers);
  
  	printf("%d/%d\n", n_buffers, n_fsm_pages);
