- ported from linux-2.4.25-atmdd.patch

[packages/kernel.git] / 2.6.0-t8-initrd.patch

diff -urN linux-2.6.0-test8-orig/init/do_mounts_initrd.c linux-2.6.0-test8/init/do_mounts_initrd.c
--- linux-2.6.0-test8-orig/init/do_mounts_initrd.c	2003-10-18 22:09:23.000000000 +0200
+++ linux-2.6.0-test8/init/do_mounts_initrd.c	2003-10-18 22:10:03.000000000 +0200
@@ -109,12 +109,12 @@
 		 * in that case the ram disk is just set up here, and gets
 		 * mounted in the normal path.
 		 */
-		if (rd_load_image("/dev/initrd") && ROOT_DEV != Root_RAM0) {
-			sys_unlink("/dev/initrd");
+		if (rd_load_image("/initrd.img") && ROOT_DEV != Root_RAM0) {
+			sys_unlink("/initrd.img");
 			handle_initrd();
 			return 1;
 		}
 	}
-	sys_unlink("/dev/initrd");
+	sys_unlink("/initrd.img");
 	return 0;
 }
diff -urN linux-2.6.0-test8-orig/init/do_mounts_rd.c linux-2.6.0-test8/init/do_mounts_rd.c
--- linux-2.6.0-test8-orig/init/do_mounts_rd.c	2003-10-18 22:09:23.000000000 +0200
+++ linux-2.6.0-test8/init/do_mounts_rd.c	2003-10-18 22:10:16.000000000 +0200
@@ -185,7 +185,7 @@
 	else
 		devblocks >>= 1;
 
-	if (strcmp(from, "/dev/initrd") == 0)
+	if (strcmp(from, "/initrd.img") == 0)
 		devblocks = nblocks;
 
 	if (devblocks == 0) {
diff -urN linux-2.6.0-test8-orig/init/initramfs.c linux-2.6.0-test8/init/initramfs.c
--- linux-2.6.0-test8-orig/init/initramfs.c	2003-10-18 22:09:23.000000000 +0200
+++ linux-2.6.0-test8/init/initramfs.c	2003-10-18 22:09:35.000000000 +0200
@@ -497,7 +497,7 @@
 			return;
 		}
 		printk("it isn't (%s); looks like an initrd\n", err);
-		fd = sys_open("/dev/initrd", O_WRONLY|O_CREAT, 700);
+		fd = sys_open("/initrd.img", O_WRONLY|O_CREAT, 700);
 		if (fd >= 0) {
 			sys_write(fd, (char *)initrd_start,
 					initrd_end - initrd_start);