uc_mgr_import_master_config() first calls load_master_config()
with the card's longname and if that fails then calls it again with the
card_name.
Before this commit configuration_filename() would force conf_format to 2
when it the access(fn, R_OK) test failed for the ucm1 longname
master-config filename.
This would cause configuration_filename() to blindly return a filename
under <prefix>/ucm2 without seeing if that is actually there and without
trying to fallback to the old profiles under <prefix>/ucm, breaking the
loading of UCM1 profiles by card_name.
This commit fixes this by modifying configuration_filename() to not set
conf_format when checking for the UCM1 config filename fails.
Instead, to make sure that any errors about opening the file still report
the new path, configuration_filename() now resets the filename to the UCM2
path if the access() check has failed for both the UCM2 and UCM1 paths,
without touching conf_format.
Fixes:
aba2260ae7b5 ("ucm: switch to ucm2 directory and v2 format, keep backward compatibility")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
}
if (uc_mgr->conf_format > 0) {
-__format:
configuration_filename2(fn, fn_len, uc_mgr->conf_format,
dir, file, suffix);
return;
return;
configuration_filename2(fn, fn_len, 0, dir, file, suffix);
- if (access(fn, R_OK)) {
- /* make sure that the error message refers to the new path */
- uc_mgr->conf_format = 2;
- goto __format;
- }
+ if (access(fn, R_OK) == 0)
+ return;
+
+ /* make sure that the error message refers to the new path */
+ configuration_filename2(fn, fn_len, 2, dir, file, suffix);
}
/*