i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: Don't load modules from non-packaged under "disable user add-ons".

Browse Source 
This matches the behavior of the "new-style" module system.
Part of #14361.
This commit is contained in:
Augustin Cavalier
2019-03-03 17:20:53 -05:00
parent ee735d1b33
commit dedf24f757
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/device_manager/legacy_drivers.cpp
+2 -2
View File
@@ -945,7 +945,7 @@ DirectoryIterator::SetTo(const char* path, const char* subPath, bool recursive)
B_SAFEMODE_DISABLE_USER_ADD_ONS, false); B_SAFEMODE_DISABLE_USER_ADD_ONS, false);
for (uint32 i = 0; i < sizeof(kDriverPaths) / sizeof(kDriverPaths[0]); i++) { for (uint32 i = 0; i < sizeof(kDriverPaths) / sizeof(kDriverPaths[0]); i++) {
if (i < 2 && disableUserAddOns) if (i < 3 && disableUserAddOns)
continue; continue;
if (__find_directory(kDriverPaths[i], gBootDevice, true, if (__find_directory(kDriverPaths[i], gBootDevice, true,
@@ -1480,7 +1480,7 @@ legacy_driver_probe(const char* subPath)
B_SAFEMODE_DISABLE_USER_ADD_ONS, false); B_SAFEMODE_DISABLE_USER_ADD_ONS, false);
for (uint32 i = 0; i < sizeof(kDriverPaths) / sizeof(kDriverPaths[0]); i++) { for (uint32 i = 0; i < sizeof(kDriverPaths) / sizeof(kDriverPaths[0]); i++) {
if (i < 2 && disableUserAddOns) if (i < 3 && disableUserAddOns)
continue; continue;
if (__find_directory(kDriverPaths[i], gBootDevice, true, if (__find_directory(kDriverPaths[i], gBootDevice, true,