hrev51987 adds 1 changeset to branch 'master'
old head: 8088f452ff0e7df350ea74b8aa26d55149f2f100
new head: 0d1e94a465bc2a8c40a82395327eaae4649dbc72
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=0d1e94a465bc+%5E8088f452ff0e
----------------------------------------------------------------------------
0d1e94a465bc: mount_server: restore automount notification.
Fix #14149.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51987
Commit: 0d1e94a465bc2a8c40a82395327eaae4649dbc72
URL: https://git.haiku-os.org/haiku/commit/?id=0d1e94a465bc
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Mon Jun 4 20:55:02 2018 UTC
Ticket: https://dev.haiku-os.org/ticket/14149
----------------------------------------------------------------------------
2 files changed, 3 insertions(+), 2 deletions(-)
src/servers/mount/AutoMounter.cpp | 3 +--
src/servers/mount/AutoMounter.h | 2 ++
----------------------------------------------------------------------------
diff --git a/src/servers/mount/AutoMounter.cpp
b/src/servers/mount/AutoMounter.cpp
index e841fddf2e..cdea7e7a75 100644
--- a/src/servers/mount/AutoMounter.cpp
+++ b/src/servers/mount/AutoMounter.cpp
@@ -185,8 +185,7 @@ MountVisitor::Visit(BPartition* partition, int32 level)
if (!fInitialRescan) {
// Ask the user about mount flags if this is not the
// initial scan.
- // TODO!
- //if (!_SuggestMountFlags(partition, &mountFlags))
+ if (!AutoMounter::_SuggestMountFlags(partition, &mountFlags))
return false;
} else {
BString mountFlagsKey(path.Path());
diff --git a/src/servers/mount/AutoMounter.h b/src/servers/mount/AutoMounter.h
index 4c4c5bd950..05cc406b75 100644
--- a/src/servers/mount/AutoMounter.h
+++ b/src/servers/mount/AutoMounter.h
@@ -61,6 +61,8 @@ private:
static bool _SuggestMountFlags(const
BPartition* partition,
uint32*
_flags);
+ friend class MountVisitor;
+
private:
mount_mode fNormalMode;
mount_mode fRemovableMode;
