]> git.pld-linux.org Git - packages/kernel.git/blob - 2.6.0-t8-initrd.patch
- [2.4.2x, 2.6.x] don't recursively crash in die() on CHRP/PReP machines
[packages/kernel.git] / 2.6.0-t8-initrd.patch
1 diff -urN linux-2.6.0-test8-orig/init/do_mounts_initrd.c linux-2.6.0-test8/init/do_mounts_initrd.c
2 --- linux-2.6.0-test8-orig/init/do_mounts_initrd.c      2003-10-18 22:09:23.000000000 +0200
3 +++ linux-2.6.0-test8/init/do_mounts_initrd.c   2003-10-18 22:10:03.000000000 +0200
4 @@ -109,12 +109,12 @@
5                  * in that case the ram disk is just set up here, and gets
6                  * mounted in the normal path.
7                  */
8 -               if (rd_load_image("/dev/initrd") && ROOT_DEV != Root_RAM0) {
9 -                       sys_unlink("/dev/initrd");
10 +               if (rd_load_image("/initrd.img") && ROOT_DEV != Root_RAM0) {
11 +                       sys_unlink("/initrd.img");
12                         handle_initrd();
13                         return 1;
14                 }
15         }
16 -       sys_unlink("/dev/initrd");
17 +       sys_unlink("/initrd.img");
18         return 0;
19  }
20 diff -urN linux-2.6.0-test8-orig/init/do_mounts_rd.c linux-2.6.0-test8/init/do_mounts_rd.c
21 --- linux-2.6.0-test8-orig/init/do_mounts_rd.c  2003-10-18 22:09:23.000000000 +0200
22 +++ linux-2.6.0-test8/init/do_mounts_rd.c       2003-10-18 22:10:16.000000000 +0200
23 @@ -185,7 +185,7 @@
24         else
25                 devblocks >>= 1;
26  
27 -       if (strcmp(from, "/dev/initrd") == 0)
28 +       if (strcmp(from, "/initrd.img") == 0)
29                 devblocks = nblocks;
30  
31         if (devblocks == 0) {
32 diff -urN linux-2.6.0-test8-orig/init/initramfs.c linux-2.6.0-test8/init/initramfs.c
33 --- linux-2.6.0-test8-orig/init/initramfs.c     2003-10-18 22:09:23.000000000 +0200
34 +++ linux-2.6.0-test8/init/initramfs.c  2003-10-18 22:09:35.000000000 +0200
35 @@ -497,7 +497,7 @@
36                         return;
37                 }
38                 printk("it isn't (%s); looks like an initrd\n", err);
39 -               fd = sys_open("/dev/initrd", O_WRONLY|O_CREAT, 700);
40 +               fd = sys_open("/initrd.img", O_WRONLY|O_CREAT, 700);
41                 if (fd >= 0) {
42                         sys_write(fd, (char *)initrd_start,
43                                         initrd_end - initrd_start);
This page took 0.031968 seconds and 3 git commands to generate.