misc/95074: Problem while upgrading; mergemaster

[Dharam Paul Balley]

>Number:         95074
>Category:       misc
>Synopsis:       Problem while upgrading; mergemaster
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 29 12:10:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Dharam Paul Balley
>Release:        Free BSD 5.4
>Organization:
>Environment:
I can not log in at all to the machine now.
>Description:
I installed freebsd 5.4.
I upgraded to source of RELENG_6_0 while I fetched in the ports of current release by use of '*default tag=.

I followed following steps after downloading above with CVSUP: (Please pardon me , I am from windows background for my language
I backed up my kernel, 
#cd /usr/src/sys/i386/conf
#cp GENERIC GENERIC1.BAK
next>>
#cd /usr/ports
#make installworld
#make buildworld
#make buildkernel KERNCONF=GENERIC
#make install kernel KERNCONF=GENERIC
Now restarted 
#shutdown -r now
and logged in in single user mode.

Now the display was
*** Displaying difference of difference between ./etc/master.password & installed version
---/etc/master.passwd Thu MAr 23 13:46:04 2006
+++./etc/master.passwd Mon Jun 6 20:19:56:2006
@@-1,6 +1,6@@  

(I am  not writing here all the output of differences)

Do you wish to delete what is left of 
/var/tmp/temproot?

My action: I opted for no.

Message: 
You installed a new master.passwd file so make sure you run '/usr/sbin/pwd_mkdb -p/etc/master.passwd' to rebuild your password files.
Would you like to run it now
y/n

My action: I opeted 'y"

Message:
Running /usr/sbin/pwd/pwd_mkdb -p/etc/master.passwd
***comparing make variables
***Form /etc/make.con
*** Form /usr/share/examples/etc/make.conf
PERL_VER=5.6.6
*No example variable with this name
PERL_VERSION=5.6.6
*No example variable with this name
cathy at alfa#
(After this I rebooted and I can not login now)

----------------------------

Sir/Madam,
What is the remedy available to me now? I can not load my backed up kernel also. Or may be that since I am a newbie, I am not not following the correct procedure. Do I have to reinstall the system now?

I started this upgrade process because my delay pools were not working on squid in freeBSD 5.4.
Thanks and regards.

#FreeBSd
>How-To-Repeat:
Can's say please.
>Fix:
Can not say please.
>Release-Note:
>Audit-Trail:
>Unformatted: