Changeset ebb1489 in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• kernel/generic/src/main/kinit.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -296 +296 @@
                         }
 
-                } else if (i == init.cnt - 1) {
-                        /*
-                         * Assume the last task is the RAM disk.
-                         */
+                } else if (str_cmp(name, "initrd.img") == 0) {
                         init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
                 } else {