hrev52958 adds 1 changeset to branch 'master'
old head: ee735d1b3384bec17d6361ccfa60d5283e8dc785
new head: dedf24f75771e6fa038d3f6e1c47f54cd30597c2
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=dedf24f75771+%5Eee735d1b3384
----------------------------------------------------------------------------
dedf24f75771: kernel: Don't load modules from non-packaged under "disable user
add-ons".
This matches the behavior of the "new-style" module system.
Part of #14361.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52958
Commit: dedf24f75771e6fa038d3f6e1c47f54cd30597c2
URL: https://git.haiku-os.org/haiku/commit/?id=dedf24f75771
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Mar 3 22:20:53 2019 UTC
Ticket: https://dev.haiku-os.org/ticket/14361
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
src/system/kernel/device_manager/legacy_drivers.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/system/kernel/device_manager/legacy_drivers.cpp
b/src/system/kernel/device_manager/legacy_drivers.cpp
index 8649ac80d2..e0b169d57c 100644
--- a/src/system/kernel/device_manager/legacy_drivers.cpp
+++ b/src/system/kernel/device_manager/legacy_drivers.cpp
@@ -945,7 +945,7 @@ DirectoryIterator::SetTo(const char* path, const char*
subPath, bool recursive)
B_SAFEMODE_DISABLE_USER_ADD_ONS, false);
for (uint32 i = 0; i < sizeof(kDriverPaths) /
sizeof(kDriverPaths[0]); i++) {
- if (i < 2 && disableUserAddOns)
+ if (i < 3 && disableUserAddOns)
continue;
if (__find_directory(kDriverPaths[i], gBootDevice, true,
@@ -1480,7 +1480,7 @@ legacy_driver_probe(const char* subPath)
B_SAFEMODE_DISABLE_USER_ADD_ONS, false);
for (uint32 i = 0; i < sizeof(kDriverPaths) /
sizeof(kDriverPaths[0]); i++) {
- if (i < 2 && disableUserAddOns)
+ if (i < 3 && disableUserAddOns)
continue;
if (__find_directory(kDriverPaths[i], gBootDevice, true,
