diff --git a/src/system/boot/loader/loader.cpp b/src/system/boot/loader/loader.cpp index 6fa947c87c..e19234402b 100644 --- a/src/system/boot/loader/loader.cpp +++ b/src/system/boot/loader/loader.cpp @@ -173,61 +173,6 @@ load_modules_from(BootVolume& volume, const char* path) } -/** Loads a module by module name. This basically works in the same - * way as the kernel module loader; it will cut off the last part - * of the module name until it could find a module and loads it. - * It tests both, kernel and user module directories. - */ - -static status_t -load_module(BootVolume& volume, const char* name) -{ - char moduleName[B_FILE_NAME_LENGTH]; - if (strlcpy(moduleName, name, sizeof(moduleName)) > sizeof(moduleName)) - return B_NAME_TOO_LONG; - - for (int32 i = 0; sAddonPaths[i]; i++) { - // get base path - int baseFD = open_maybe_packaged(volume, sAddonPaths[i], O_RDONLY); - if (baseFD < B_OK) - continue; - - Directory *base = (Directory *)get_node_from(baseFD); - if (base == NULL) { - close(baseFD); - continue; - } - - while (true) { - int fd = open_from(base, moduleName, O_RDONLY); - if (fd >= B_OK) { - struct stat stat; - if (fstat(fd, &stat) != 0 || !S_ISREG(stat.st_mode)) - return B_BAD_VALUE; - - status_t status = elf_load_image(base, moduleName); - - close(fd); - close(baseFD); - return status; - } - - // cut off last name element (or stop trying if there are no more) - - char *last = strrchr(moduleName, '/'); - if (last != NULL) - last[0] = '\0'; - else - break; - } - - close(baseFD); - } - - return B_OK; -} - - status_t load_modules(stage2_args* args, BootVolume& volume) {