but the build was confused by the fact that they did share some files.

Move INITRD code from do_mounts_rd.c to new file do_mounts_initrd.c.