git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
init
/
do_mounts.c
diff --git
a/init/do_mounts.c
b/init/do_mounts.c
index
94aeec7
..
f4b7b9d
100644
(file)
--- a/
init/do_mounts.c
+++ b/
init/do_mounts.c
@@
-325,7
+325,7
@@
static int __init mount_nfs_root(void)
{
void *data = nfs_root_data();
{
void *data = nfs_root_data();
- create_dev("/dev/root", ROOT_DEV);
+ create_dev("/dev/root", ROOT_DEV
, NULL
);
if (data &&
do_mount_root("/dev/root", "nfs", root_mountflags, data) == 0)
return 1;
if (data &&
do_mount_root("/dev/root", "nfs", root_mountflags, data) == 0)
return 1;
@@
-386,7
+386,7
@@
void __init mount_root(void)
change_floppy("root floppy");
}
#endif
change_floppy("root floppy");
}
#endif
- create_dev("/dev/root", ROOT_DEV);
+ create_dev("/dev/root", ROOT_DEV
, root_device_name
);
mount_block_root("/dev/root", root_mountflags);
}
mount_block_root("/dev/root", root_mountflags);
}
@@
-397,6
+397,8
@@
void __init prepare_namespace(void)
{
int is_floppy;
{
int is_floppy;
+ mount_devfs();
+
if (root_delay) {
printk(KERN_INFO "Waiting %dsec before mounting root device...\n",
root_delay);
if (root_delay) {
printk(KERN_INFO "Waiting %dsec before mounting root device...\n",
root_delay);
@@
-407,10
+409,6
@@
void __init prepare_namespace(void)
if (saved_root_name[0]) {
root_device_name = saved_root_name;
if (saved_root_name[0]) {
root_device_name = saved_root_name;
- if (!strncmp(root_device_name, "mtd", 3)) {
- mount_block_root(root_device_name, root_mountflags);
- goto out;
- }
ROOT_DEV = name_to_dev_t(root_device_name);
if (strncmp(root_device_name, "/dev/", 5) == 0)
root_device_name += 5;
ROOT_DEV = name_to_dev_t(root_device_name);
if (strncmp(root_device_name, "/dev/", 5) == 0)
root_device_name += 5;
@@
-426,8
+424,10
@@
void __init prepare_namespace(void)
mount_root();
out:
mount_root();
out:
+ umount_devfs("/dev");
sys_mount(".", "/", NULL, MS_MOVE, NULL);
sys_chroot(".");
security_sb_post_mountroot();
sys_mount(".", "/", NULL, MS_MOVE, NULL);
sys_chroot(".");
security_sb_post_mountroot();
+ mount_devfs_fs ();
}
}