Resolves: rhbz#784327 --- loader/driverdisk.c | 7 ++----- loader/driverdisk.h | 1 + loader/loader.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/loader/driverdisk.c b/loader/driverdisk.c index 707c253..26033d2 100644 --- a/loader/driverdisk.c +++ b/loader/driverdisk.c @@ -300,7 +300,6 @@ static int loadDriverDisk(struct loaderData_s *loaderData, char *mntpt) { /* FIXME moduleInfoSet modInfo = loaderData->modInfo; */ char file[200], dest[200], src[200]; char *title; - char *fwdir = NULL; struct moduleBallLocation * location; struct stat sb; static int disknum = 0; @@ -374,13 +373,11 @@ static int loadDriverDisk(struct loaderData_s *loaderData, char *mntpt) { logMessage(ERROR, "Error running depmod -a for driverdisc no.%d", disknum); }

- checked_asprintf(&fwdir, DD_FIRMWARE); - if (!access(fwdir, R_OK|X_OK)) { - add_fw_search_dir(loaderData, fwdir); + if (!access(DD_FIRMWARE, R_OK|X_OK)) { + add_fw_search_dir(loaderData, DD_FIRMWARE_SEARCH); stop_fw_loader(loaderData); start_fw_loader(loaderData); } - free(fwdir);

/* TODO generate and read module info * diff --git a/loader/driverdisk.h b/loader/driverdisk.h index 4dc8685..421f572 100644 --- a/loader/driverdisk.h +++ b/loader/driverdisk.h @@ -28,6 +28,7 @@ #define DD_EXTRACTED "/tmp/DD" #define DD_MODULES "/tmp/DD/lib/modules" #define DD_FIRMWARE "/tmp/DD/lib/firmware" +#define DD_FIRMWARE_SEARCH "/tmp/DD/lib/firmware/updates:/tmp/DD/lib/firmware"

extern char *ddFsTypes[];

diff --git a/loader/loader.c b/loader/loader.c index 177d8a3..5bbb7c1 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2079,7 +2079,7 @@ int main(int argc, char ** argv) { } if (hasGraphicalOverride()) flags |= LOADER_FLAGS_EARLY_NETWORKING; - set_fw_search_path(&loaderData, "/firmware:/lib/firmware"); + set_fw_search_path(&loaderData, "/lib/firmware/updates:/firmware:/lib/firmware"); start_fw_loader(&loaderData);

arg = "/lib/modules/module-info";