kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dracut-install: fix relative paths in --kerneldir 

kerneldirlen is used to modify absolute path returned by
kmod_module_get_path() while it is calculated on user-supplied
--kerneldir argument which can be a relative path.

Use kmod_get_dirname() to convert user-supplied path to the same format
as used by kmod_module_get_path().

This also allows to get rid of now useless strcmp checks that seem to
imply that /lib and /usr/lib are linked which is not always true.
master
Artem Savkov 2017-09-21 10:36:58 +02:00
parent 424c065cd9
commit ef84ce2521
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
install/dracut-install.c
View File

@ -933,13 +933,6 @@ static int parse_argv(int argc, char *argv[])
break; break;
case ARG_KERNELDIR: case ARG_KERNELDIR:
kerneldir = strdup(optarg); kerneldir = strdup(optarg);
if ((strncmp("/lib/modules/", kerneldir, 13) != 0)
&& (strncmp("/usr/lib/modules/", kerneldir, 17) != 0)) {
char *p;
p = strstr(kerneldir, "/lib/modules/");
if (p != NULL)
kerneldirlen = p - kerneldir;
}
break; break;
case ARG_FIRMWAREDIRS: case ARG_FIRMWAREDIRS:
firmwaredirs = strv_split(optarg, ":"); firmwaredirs = strv_split(optarg, ":");
@ -1399,9 +1392,17 @@ static int install_modules(int argc, char **argv)
struct kmod_module *mod = NULL, *mod_o = NULL; struct kmod_module *mod = NULL, *mod_o = NULL;


const char *modname = NULL; const char *modname = NULL;
char *abskpath = NULL;
char *p;
int i; int i;


ctx = kmod_new(kerneldir, NULL); ctx = kmod_new(kerneldir, NULL);
abskpath = kmod_get_dirname(ctx);

p = strstr(abskpath, "/lib/modules/");
if (p != NULL)
kerneldirlen = p - abskpath;

if (arg_hostonly) { if (arg_hostonly) {
char *modalias_file; char *modalias_file;
modalias_file = getenv("DRACUT_KERNEL_MODALIASES"); modalias_file = getenv("DRACUT_KERNEL_MODALIASES");