Integrated some changes in usr/init/init.c