From: Marcos Mello <marcosfrm@gmail.com>
Date: Mon, 24 May 2021 00:04:20 +0000 (-0300)
Subject: feat(install): add default value for --firmwaredirs
X-Git-Tag: 055~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cb086fa2995799b95c0b25bc9a0cf72ba3868ea;p=thirdparty%2Fdracut.git

feat(install): add default value for --firmwaredirs

If not specified, use /lib/firmware.
---

diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
index 3fd70fc88..018fdbd76 100644
--- a/src/install/dracut-install.c
+++ b/src/install/dracut-install.c
@@ -1004,7 +1004,9 @@ static void usage(int status)
                "\n"
                "  --module,-m       Install kernel modules, instead of files\n"
                "  --kerneldir       Specify the kernel module directory\n"
+               "                     (default: /lib/modules/`uname -r`)\n"
                "  --firmwaredirs    Specify the firmware directory search path with : separation\n"
+               "                     (default: DRACUT_FIRMWARE_PATH env var, /lib/firmware if not set)\n"
                "  --silent          Don't display error messages for kernel module install\n"
                "  --modalias        Only generate module list from /sys/devices modalias list\n"
                "  -o --optional     If kernel module does not exist, do not fail\n"
@@ -1183,14 +1185,12 @@ static int parse_argv(int argc, char *argv[])
 
                         path = getenv("DRACUT_FIRMWARE_PATH");
 
-                        if (path == NULL) {
-                                log_error("Environment variable DRACUT_FIRMWARE_PATH is not set");
-                                exit(EXIT_FAILURE);
+                        if (path) {
+                                log_debug("DRACUT_FIRMWARE_PATH=%s", path);
+                                firmwaredirs = strv_split(path, ":");
+                        } else {
+                                firmwaredirs = strv_new("/lib/firmware", NULL);
                         }
-
-                        log_debug("DRACUT_FIRMWARE_PATH=%s", path);
-
-                        firmwaredirs = strv_split(path, ":");
                 }
         }