2002-03-24 00:58:20

by Alexander Viro

[permalink] [raw]
Subject: [PATCH] Re: [2.5.7] initrd issue



On Fri, 22 Mar 2002, Henrik Storner wrote:

> I've since changed my setup so I do not need the initrd to boot
> (moved my root-fs from an LVM volume to a separate partition),
> but if you need testing let me know.

Grrr... The problem appeared back in 2.5.2-pre6 when kdev_t type had been
changed. Offending line is
- if (initrd_load() && ROOT_DEV != MKDEV(RAMDISK_MAJOR, 0)) {
+ if (initrd_load() && kdev_same(ROOT_DEV, mk_kdev(RAMDISK_MAJOR,

and obvious fix is

diff -urN C7-0/init/do_mounts.c C7-current/init/do_mounts.c
--- C7-0/init/do_mounts.c Fri Mar 8 02:09:56 2002
+++ C7-current/init/do_mounts.c Sat Mar 23 19:53:27 2002
@@ -826,7 +826,7 @@

create_dev("/dev/root", ROOT_DEV, NULL);
if (mount_initrd) {
- if (initrd_load() && kdev_same(ROOT_DEV, mk_kdev(RAMDISK_MAJOR, 0))) {
+ if (initrd_load() && !kdev_same(ROOT_DEV, mk_kdev(RAMDISK_MAJOR, 0))) {
handle_initrd();
goto out;
}