View | Details | Raw Unified
Collapse All | Expand All

(-) linux-2.6.20-gentoo-r6/init/do_mounts.c (-3 / +11 lines)
 Lines 354-360    Link Here  
	va_start(args, fmt);
	va_start(args, fmt);
	vsprintf(buf, fmt, args);
	vsprintf(buf, fmt, args);
	va_end(args);
	va_end(args);
	fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
 
	if (saved_root_name[0])
 

              
		fd = sys_open(saved_root_name, O_RDWR | O_NDELAY, 0);

            

            

              

              
	else

            

            

              

              
		fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);

            

        
	if (fd >= 0) {
	if (fd >= 0) {

        
		sys_ioctl(fd, FDEJECT, 0);
		sys_ioctl(fd, FDEJECT, 0);

        
		sys_close(fd);
		sys_close(fd);

  

    

    

       Lines 397-404
       
    
  Link Here 
    

  

        
	}
	}

        
#endif
#endif

        
#ifdef CONFIG_BLOCK
#ifdef CONFIG_BLOCK

            

              
	create_dev("/dev/root", ROOT_DEV);

              
	if (saved_root_name[0]) {

            

            

              
	mount_block_root("/dev/root", root_mountflags);

              
		create_dev(saved_root_name, ROOT_DEV);

            

            

              

              
		mount_block_root(saved_root_name, root_mountflags);

            

            

              

              
	} else {

            

            

              

              
		create_dev("/dev/root", ROOT_DEV);

            

            

              

              
		mount_block_root("/dev/root", root_mountflags);

            

            

              

              
	}

            

        
#endif
#endif

        
}
}