From 011a4cdbfc509588e4d716f8147556670b7ba638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 7 Oct 2009 19:31:57 +0000 Subject: [PATCH] * Removed now obsolete notification (this was not even used in Tracker anymore). * Added interface to get the current settings. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33486 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/mount/MountServer.h | 3 ++- src/servers/mount/AutoMounter.cpp | 17 ++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/headers/private/mount/MountServer.h b/headers/private/mount/MountServer.h index 83b76a80bc..254c54e56b 100644 --- a/headers/private/mount/MountServer.h +++ b/headers/private/mount/MountServer.h @@ -11,10 +11,11 @@ const uint32 kMountVolume = 'mntv'; const uint32 kMountAllNow = 'mntn'; const uint32 kSetAutomounterParams = 'pmst'; +const uint32 kGetAutomounterParams = 'gpms'; const uint32 kVolumeMounted = 'vmtd'; const uint32 kUnmountVolume = 'umnt'; -const char* kMountServerSignature = "application/x-vnd.Haiku-mount_server"; +#define kMountServerSignature "application/x-vnd.Haiku-mount_server" #endif // _MOUNT_SERVER_H diff --git a/src/servers/mount/AutoMounter.cpp b/src/servers/mount/AutoMounter.cpp index cf680545f1..907cf00a5c 100644 --- a/src/servers/mount/AutoMounter.cpp +++ b/src/servers/mount/AutoMounter.cpp @@ -123,6 +123,14 @@ AutoMounter::MessageReceived(BMessage* message) break; } + case kGetAutomounterParams: + { + BMessage reply; + _GetSettings(&reply); + message->SendReply(&reply); + break; + } + case kMountAllNow: _MountVolumes(kAllVolumes, kAllVolumes); break; @@ -498,13 +506,8 @@ AutoMounter::_MountVolumes(mount_mode normal, mount_mode removable, } } - if (partition->Mount(NULL, mountFlags) == B_OK - && partition->GetMountPoint(&path) == B_OK) { - // notify Tracker that a new volume has been started - BMessage note(kVolumeMounted); - note.AddString("path", path.Path()); - note.AddBool("initial rescan", fInitialRescan); - be_app->PostMessage(¬e); + if (partition->Mount(NULL, mountFlags) != B_OK) { + // TODO: Error to syslog } return false; }