diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:05 -0400 |
commit | bdaf8529385d5126ef791e8f1914afff8cd59bcf (patch) | |
tree | aa9e917703526ad034a19cf1b16002aba486cd17 /init/do_mounts_initrd.c | |
parent | a29641883f57f36424e3219ae9ff48dd6cd34de0 (diff) |
[PATCH] devfs: Remove devfs from the init code
This patch removes the devfs code from the init/ directory.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'init/do_mounts_initrd.c')
-rw-r--r-- | init/do_mounts_initrd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 405f9031af87..a06f037fa000 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c | |||
@@ -44,7 +44,7 @@ static void __init handle_initrd(void) | |||
44 | int pid; | 44 | int pid; |
45 | 45 | ||
46 | real_root_dev = new_encode_dev(ROOT_DEV); | 46 | real_root_dev = new_encode_dev(ROOT_DEV); |
47 | create_dev("/dev/root.old", Root_RAM0, NULL); | 47 | create_dev("/dev/root.old", Root_RAM0); |
48 | /* mount initrd on rootfs' /root */ | 48 | /* mount initrd on rootfs' /root */ |
49 | mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY); | 49 | mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY); |
50 | sys_mkdir("/old", 0700); | 50 | sys_mkdir("/old", 0700); |
@@ -54,7 +54,6 @@ static void __init handle_initrd(void) | |||
54 | sys_chdir("/root"); | 54 | sys_chdir("/root"); |
55 | sys_mount(".", "/", NULL, MS_MOVE, NULL); | 55 | sys_mount(".", "/", NULL, MS_MOVE, NULL); |
56 | sys_chroot("."); | 56 | sys_chroot("."); |
57 | mount_devfs_fs (); | ||
58 | 57 | ||
59 | current->flags |= PF_NOFREEZE; | 58 | current->flags |= PF_NOFREEZE; |
60 | pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD); | 59 | pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD); |
@@ -71,7 +70,6 @@ static void __init handle_initrd(void) | |||
71 | sys_chroot("."); | 70 | sys_chroot("."); |
72 | sys_close(old_fd); | 71 | sys_close(old_fd); |
73 | sys_close(root_fd); | 72 | sys_close(root_fd); |
74 | umount_devfs("/old/dev"); | ||
75 | 73 | ||
76 | if (new_decode_dev(real_root_dev) == Root_RAM0) { | 74 | if (new_decode_dev(real_root_dev) == Root_RAM0) { |
77 | sys_chdir("/old"); | 75 | sys_chdir("/old"); |
@@ -107,7 +105,7 @@ static void __init handle_initrd(void) | |||
107 | int __init initrd_load(void) | 105 | int __init initrd_load(void) |
108 | { | 106 | { |
109 | if (mount_initrd) { | 107 | if (mount_initrd) { |
110 | create_dev("/dev/ram", Root_RAM0, NULL); | 108 | create_dev("/dev/ram", Root_RAM0); |
111 | /* | 109 | /* |
112 | * Load the initrd data into /dev/ram0. Execute it as initrd | 110 | * Load the initrd data into /dev/ram0. Execute it as initrd |
113 | * unless /dev/ram0 is supposed to be our actual root device, | 111 | * unless /dev/ram0 is supposed to be our actual root device, |