Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 438380 | Differences between
and this patch

Collapse All | Expand All

(-)a/init/do_mounts.c (-3 / +11 lines)
Lines 461-467 void __init change_floppy(char *fmt, ...) Link Here
461
	va_start(args, fmt);
461
	va_start(args, fmt);
462
	vsprintf(buf, fmt, args);
462
	vsprintf(buf, fmt, args);
463
	va_end(args);
463
	va_end(args);
464
	fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
464
	if (saved_root_name[0])
465
		fd = sys_open(saved_root_name, O_RDWR | O_NDELAY, 0);
466
	else
467
		fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
465
	if (fd >= 0) {
468
	if (fd >= 0) {
466
		sys_ioctl(fd, FDEJECT, 0);
469
		sys_ioctl(fd, FDEJECT, 0);
467
		sys_close(fd);
470
		sys_close(fd);
Lines 504-511 void __init mount_root(void) Link Here
504
	}
507
	}
505
#endif
508
#endif
506
#ifdef CONFIG_BLOCK
509
#ifdef CONFIG_BLOCK
507
	create_dev("/dev/root", ROOT_DEV);
510
	if (saved_root_name[0]) {
508
	mount_block_root("/dev/root", root_mountflags);
511
		create_dev(saved_root_name, ROOT_DEV);
512
		mount_block_root(saved_root_name, root_mountflags);
513
	} else {
514
		create_dev("/dev/root", ROOT_DEV);
515
		mount_block_root("/dev/root", root_mountflags);
516
	}
509
#endif
517
#endif
510
}
518
}
511
519

Return to bug 438380