[haiku-commits] r33555 - in haiku/trunk: data/system/boot src/apps/diskusage src/kits/tracker
- From: superstippi@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 12 Oct 2009 16:52:17 +0200 (CEST)
Author: stippi
Date: 2009-10-12 16:52:17 +0200 (Mon, 12 Oct 2009)
New Revision: 33555
Changeset: http://dev.haiku-os.org/changeset/33555/haiku
Modified:
haiku/trunk/data/system/boot/Bootscript
haiku/trunk/src/apps/diskusage/Jamfile
haiku/trunk/src/kits/tracker/AutoMounter.cpp
haiku/trunk/src/kits/tracker/AutoMounter.h
haiku/trunk/src/kits/tracker/AutoMounterSettings.cpp
haiku/trunk/src/kits/tracker/AutoMounterSettings.h
haiku/trunk/src/kits/tracker/Commands.h
haiku/trunk/src/kits/tracker/Jamfile
haiku/trunk/src/kits/tracker/MountMenu.cpp
haiku/trunk/src/kits/tracker/SettingsViews.cpp
haiku/trunk/src/kits/tracker/SettingsViews.h
haiku/trunk/src/kits/tracker/Tracker.cpp
haiku/trunk/src/kits/tracker/Tracker.h
Log:
* Removed auto mounter code from Tracker.
* Tracker forwards auto mounter related messages to the mount_server.
* Rewrote AutoMounterSettings to not know AutoMounter and use
the layout-management.
* Moved the "Eject When Unmounting" setting into the Mount Settings.
* Launch the mount_server during boot, but delay the script until all
previously mounted volumes have been mounted. This solves some annoying
timing bugs during boot. For example when you have desktop backgrounds
on other volumes and some servers don't deal well with the situation
of links to add-ons on other volumes becoming valid with a delay...
* src/kits/tracker/Commands.h includes the private headers/private/
mount/MountServer.h header, which made adjustments to the DiskUsage
Jamfile necessary.
Modified: haiku/trunk/data/system/boot/Bootscript
===================================================================
--- haiku/trunk/data/system/boot/Bootscript 2009-10-12 14:47:16 UTC (rev
33554)
+++ haiku/trunk/data/system/boot/Bootscript 2009-10-12 14:52:17 UTC (rev
33555)
@@ -114,10 +114,17 @@
if [ -e /etc/users ]; then
+ # TODO: system/Login needs to be fixed to launch the mount_server!
launch system/Login
# nothing more
else
cd /boot/home
+
+ launch $SERVERS/mount_server
+ waitfor -m application/x-vnd.Haiku-mount_server
+ # delay the boot script until all previous volumes have been mounted
+ hey -s mount_server DO InitialScan
+
launch system/Tracker
launch system/Deskbar
Modified: haiku/trunk/src/apps/diskusage/Jamfile
===================================================================
--- haiku/trunk/src/apps/diskusage/Jamfile 2009-10-12 14:47:16 UTC (rev
33554)
+++ haiku/trunk/src/apps/diskusage/Jamfile 2009-10-12 14:52:17 UTC (rev
33555)
@@ -1,7 +1,6 @@
SubDir HAIKU_TOP src apps diskusage ;
-UsePrivateHeaders shared ;
-UsePrivateHeaders tracker ;
+UsePrivateHeaders mount shared tracker ;
SubDirHdrs $(HAIKU_TOP) src kits tracker ;
Application DiskUsage :
Modified: haiku/trunk/src/kits/tracker/AutoMounter.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/AutoMounter.cpp 2009-10-12 14:47:16 UTC
(rev 33554)
+++ haiku/trunk/src/kits/tracker/AutoMounter.cpp 2009-10-12 14:52:17 UTC
(rev 33555)
@@ -1,779 +0,0 @@
-/*
-Open Tracker License
-
-Terms and Conditions
-
-Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice applies to all licensees
-and shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF TITLE, MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-BE INCORPORATED BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN
CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Be Incorporated shall not be
-used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from Be Incorporated.
-
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
trademarks
-of Be Incorporated in the United States and other countries. Other brand
product
-names are registered trademarks or trademarks of their respective holders.
-All rights reserved.
-*/
-
-#include "AutoMounter.h"
-
-#include <Debug.h>
-
-#include "AutoLock.h"
-#include "AutoMounterSettings.h"
-#include "Commands.h"
-#include "FSUtils.h"
-#include "Tracker.h"
-#include "TrackerSettings.h"
-
-#include <DiskDeviceRoster.h>
-#include <DiskDevice.h>
-#include <DiskDeviceList.h>
-#include <DiskDeviceTypes.h>
-#include <DiskSystem.h>
-#include <fs_volume.h>
-
-#include <Alert.h>
-#include <fs_info.h>
-#include <Message.h>
-#include <Node.h>
-#include <NodeMonitor.h>
-#include <String.h>
-#include <VolumeRoster.h>
-
-#include <string.h>
-#include <unistd.h>
-
-
-static const char *kAutoMounterSettings = "automounter_settings";
-static const uint32 kMsgInitialScan = 'insc';
-static const char* kMountFlagsKeyExtension = " mount flags";
-
-
-AutoMounter::AutoMounter()
- : BLooper("AutoMounter", B_LOW_PRIORITY),
- fNormalMode(kRestorePreviousVolumes),
- fRemovableMode(kAllVolumes)
-{
- if (!BootedInSafeMode()) {
- _ReadSettings();
- } else {
- // defeat automounter in safe mode, don't even care about the
settings
- fNormalMode = kNoVolumes;
- fRemovableMode = kNoVolumes;
- }
-
- BDiskDeviceRoster().StartWatching(this,
- B_DEVICE_REQUEST_DEVICE | B_DEVICE_REQUEST_DEVICE_LIST);
- PostMessage(kMsgInitialScan);
-}
-
-
-AutoMounter::~AutoMounter()
-{
- BDiskDeviceRoster().StopWatching(this);
-}
-
-
-static bool
-suggest_mount_flags(const BPartition* partition, uint32* _flags)
-{
- uint32 mountFlags = 0;
-
- bool askReadOnly = true;
- bool isBFS = false;
-
- if (partition->ContentType() != NULL
- && strcmp(partition->ContentType(), kPartitionTypeBFS) == 0) {
-#if 0
- askReadOnly = false;
-#endif
- isBFS = true;
- }
-
- BDiskSystem diskSystem;
- status_t status = partition->GetDiskSystem(&diskSystem);
- if (status == B_OK && !diskSystem.SupportsWriting())
- askReadOnly = false;
-
- if (partition->IsReadOnly())
- askReadOnly = false;
-
- if (askReadOnly) {
- // Suggest to the user to mount read-only until Haiku is more
mature.
- BString string;
- string << "Mounting volume ";
- if (partition->ContentName() != NULL)
- string << "'" << partition->ContentName() << "'\n\n";
- else
- string << "<unnamed volume>\n\n";
- // TODO: Use distro name instead of "Haiku"...
- if (!isBFS) {
- string << "The file system on this volume is not the
Haiku file "
- "system. It is strongly suggested to mount it
in read-only "
- "mode. ";
- } else {
- string << "It is suggested to mount all additional
Haiku volumes "
- "in read-only mode. ";
- }
- string << "This will prevent unintentional data loss because of
"
- "errors in Haiku.";
- BAlert* alert = new BAlert("Mount Warning", string.String(),
- "Mount Read/Write", "Cancel", "Mount Read-only",
- B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
- alert->SetShortcut(1, B_ESCAPE);
- int32 choice = alert->Go();
- switch (choice) {
- case 0:
- break;
- case 1:
- return false;
- case 2:
- mountFlags |= B_MOUNT_READ_ONLY;
- break;
- }
- }
-
- *_flags = mountFlags;
- return true;
-}
-
-
-void
-AutoMounter::_MountVolumes(mount_mode normal, mount_mode removable,
- bool initialRescan, partition_id deviceID)
-{
- if (normal == kNoVolumes && removable == kNoVolumes)
- return;
-
- class InitialMountVisitor : public BDiskDeviceVisitor {
- public:
- InitialMountVisitor(mount_mode normalMode, mount_mode
removableMode,
- bool initialRescan, BMessage& previous,
- partition_id deviceID)
- :
- fNormalMode(normalMode),
- fRemovableMode(removableMode),
- fInitialRescan(initialRescan),
- fPrevious(previous),
- fOnlyOnDeviceID(deviceID)
- {
- }
-
- virtual
- ~InitialMountVisitor()
- {
- }
-
- virtual bool
- Visit(BDiskDevice* device)
- {
- return Visit(device, 0);
- }
-
- virtual bool
- Visit(BPartition* partition, int32 level)
- {
- if (fOnlyOnDeviceID >= 0) {
- // only mount partitions on the given
device id
- // or if the partition ID is already
matched
- BPartition* device = partition;
- while (device->Parent() != NULL) {
- if (device->ID() ==
fOnlyOnDeviceID) {
- // we are happy
- break;
- }
- device = device->Parent();
- }
- if (device->ID() != fOnlyOnDeviceID)
- return false;
- }
-
- mount_mode mode = !fInitialRescan
- &&
partition->Device()->IsRemovableMedia()
- ? fRemovableMode : fNormalMode;
- if (mode == kNoVolumes
- || partition->IsMounted()
- || !partition->ContainsFileSystem())
- return false;
-
- BPath path;
- if (partition->GetPath(&path) != B_OK)
- return false;
-
- if (mode == kRestorePreviousVolumes) {
- // mount all volumes that were stored
in the settings file
- const char *volumeName = NULL;
- if (partition->ContentName() == NULL
- ||
fPrevious.FindString(path.Path(), &volumeName)
- != B_OK
- || strcmp(volumeName,
partition->ContentName()))
- return false;
- } else if (mode == kOnlyBFSVolumes) {
- if (partition->ContentType() == NULL
- ||
strcmp(partition->ContentType(), kPartitionTypeBFS))
- return false;
- }
-
- uint32 mountFlags;
- if (!fInitialRescan) {
- // Ask the user about mount flags if
this is not the
- // initial scan.
- if (!suggest_mount_flags(partition,
&mountFlags))
- return false;
- } else {
- BString mountFlagsKey(path.Path());
- mountFlagsKey <<
kMountFlagsKeyExtension;
- if
(fPrevious.FindInt32(mountFlagsKey.String(),
- (int32*)&mountFlags) <
B_OK) {
- mountFlags = 0;
- }
- }
-
- 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);
- }
- return false;
- }
-
- private:
- mount_mode fNormalMode;
- mount_mode fRemovableMode;
- bool fInitialRescan;
- BMessage& fPrevious;
- partition_id fOnlyOnDeviceID;
- } visitor(normal, removable, initialRescan, fSettings, deviceID);
-
- BDiskDeviceList devices;
- status_t status = devices.Fetch();
- if (status == B_OK)
- devices.VisitEachPartition(&visitor);
-}
-
-
-void
-AutoMounter::_MountVolume(const BMessage* message)
-{
- int32 id;
- if (message->FindInt32("id", &id) != B_OK)
- return;
-
- BDiskDeviceRoster roster;
- BPartition *partition;
- BDiskDevice device;
- if (roster.GetPartitionWithID(id, &device, &partition) != B_OK)
- return;
-
- uint32 mountFlags;
- if (!suggest_mount_flags(partition, &mountFlags))
- return;
-
- status_t status = partition->Mount(NULL, mountFlags);
- if (status < B_OK) {
- BString string;
- string << "Error mounting volume. (" << strerror(status) << ")";
- (new BAlert("", string.String(), "Ok"))->Go(NULL);
- }
-}
-
-
-bool
-AutoMounter::_SuggestForceUnmount(const char* name, status_t error)
-{
- BString text;
- text << "Could not unmount disk \"" << name << "\":\n\t" <<
strerror(error);
- text << "\n\nShould unmounting be forced?\n\n"
- "Note: if an application is currently writing to the volume,
unmounting"
- " it now might result in loss of data.\n";
-
- BAlert* alert = new BAlert("", text.String(), "Cancel", "Force Unmount",
- NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
- alert->SetShortcut(0, B_ESCAPE);
- int32 choice = alert->Go();
-
- return choice == 1;
-}
-
-
-void
-AutoMounter::_ReportUnmountError(const char* name, status_t error)
-{
- BString text;
- text << "Could not unmount disk \"" << name << "\":\n\t" <<
strerror(error);
-
- (new BAlert("", text.String(), "OK", NULL, NULL, B_WIDTH_AS_USUAL,
- B_WARNING_ALERT))->Go(NULL);
-}
-
-
-void
-AutoMounter::_UnmountAndEjectVolume(BPartition* partition, BPath& mountPoint,
- const char* name)
-{
- BDiskDevice device;
- if (partition == NULL) {
- // Try to retrieve partition
- BDiskDeviceRoster().FindPartitionByMountPoint(mountPoint.Path(),
- &device, &partition);
- }
-
- status_t status;
- if (partition != NULL)
- status = partition->Unmount();
- else
- status = fs_unmount_volume(mountPoint.Path(), 0);
-
- if (status < B_OK) {
- if (!_SuggestForceUnmount(name, status))
- return;
-
- if (partition != NULL)
- status = partition->Unmount(B_FORCE_UNMOUNT);
- else
- status = fs_unmount_volume(mountPoint.Path(),
B_FORCE_UNMOUNT);
- }
-
- if (status < B_OK) {
- _ReportUnmountError(partition->ContentName(), status);
- return;
- }
-
- if (TrackerSettings().EjectWhenUnmounting() && partition != NULL) {
- // eject device if it doesn't have any mounted partitions left
- class IsMountedVisitor : public BDiskDeviceVisitor {
- public:
- IsMountedVisitor()
- :
- fHasMounted(false)
- {
- }
-
- virtual bool Visit(BDiskDevice* device)
- {
- return Visit(device, 0);
- }
-
- virtual bool Visit(BPartition* partition, int32 level)
- {
- if (partition->IsMounted()) {
- fHasMounted = true;
- return true;
- }
-
- return false;
- }
-
- bool HasMountedPartitions() const
- {
- return fHasMounted;
- }
-
- private:
- bool fHasMounted;
- } visitor;
-
- partition->Device()->VisitEachDescendant(&visitor);
-
- if (!visitor.HasMountedPartitions())
- partition->Device()->Eject();
- }
-
- // remove the directory if it's a directory in rootfs
- if (dev_for_path(mountPoint.Path()) == dev_for_path("/"))
- rmdir(mountPoint.Path());
-}
-
-
-void
-AutoMounter::_UnmountAndEjectVolume(BMessage* message)
-{
- int32 id;
- if (message->FindInt32("id", &id) == B_OK) {
- BDiskDeviceRoster roster;
- BPartition *partition;
- BDiskDevice device;
- if (roster.GetPartitionWithID(id, &device, &partition) != B_OK)
- return;
-
- BPath path;
- if (partition->GetMountPoint(&path) == B_OK)
- _UnmountAndEjectVolume(partition, path,
partition->ContentName());
- } else {
- // see if we got a dev_t
-
- dev_t device;
- if (message->FindInt32("device_id", &device) != B_OK)
- return;
-
- BVolume volume(device);
- status_t status = volume.InitCheck();
-
- char name[B_FILE_NAME_LENGTH];
- if (status == B_OK)
- status = volume.GetName(name);
- if (status < B_OK)
- snprintf(name, sizeof(name), "device:%ld", device);
-
- BPath path;
- if (status == B_OK) {
- BDirectory mountPoint;
- status = volume.GetRootDirectory(&mountPoint);
- if (status == B_OK)
- status = path.SetTo(&mountPoint, ".");
- }
-
- if (status == B_OK)
- _UnmountAndEjectVolume(NULL, path, name);
- }
-}
-
-
-void
-AutoMounter::_FromMode(mount_mode mode, bool& all, bool& bfs, bool& restore)
-{
- all = bfs = restore = false;
-
- switch (mode) {
- case kAllVolumes:
- all = true;
- break;
- case kOnlyBFSVolumes:
- bfs = true;
- break;
- case kRestorePreviousVolumes:
- restore = true;
- break;
-
- default:
- break;
- }
-}
-
-
-AutoMounter::mount_mode
-AutoMounter::_ToMode(bool all, bool bfs, bool restore)
-{
- if (all)
- return kAllVolumes;
- if (bfs)
- return kOnlyBFSVolumes;
- if (restore)
- return kRestorePreviousVolumes;
-
- return kNoVolumes;
-}
-
-
-void
-AutoMounter::_ReadSettings()
-{
- BPath directoryPath;
- if (FSFindTrackerSettingsDir(&directoryPath) != B_OK)
- return;
-
- BPath path(directoryPath);
- path.Append(kAutoMounterSettings);
- fPrefsFile.SetTo(path.Path(), O_RDWR);
-
- if (fPrefsFile.InitCheck() != B_OK) {
- // no prefs file yet, create a new one
-
- BDirectory dir(directoryPath.Path());
- dir.CreateFile(kAutoMounterSettings, &fPrefsFile);
- return;
- }
-
- ssize_t settingsSize = (ssize_t)fPrefsFile.Seek(0, SEEK_END);
- if (settingsSize == 0)
- return;
-
- ASSERT(settingsSize != 0);
- char *buffer = new char[settingsSize];
-
- fPrefsFile.Seek(0, 0);
- if (fPrefsFile.Read(buffer, (size_t)settingsSize) != settingsSize) {
- PRINT(("error reading automounter settings\n"));
- delete [] buffer;
- return;
- }
-
- BMessage message('stng');
- status_t result = message.Unflatten(buffer);
- if (result != B_OK) {
- PRINT(("error %s unflattening settings, size %d\n",
strerror(result),
- settingsSize));
- delete [] buffer;
- return;
- }
-
- delete [] buffer;
-
- // update flags and modes from the message
- _UpdateSettingsFromMessage(&message);
- // copy the previously mounted partitions
- fSettings = message;
-}
-
-
-void
-AutoMounter::_WriteSettings()
-{
- if (fPrefsFile.InitCheck() != B_OK)
- return;
-
- BMessage message('stng');
- GetSettings(&message);
-
- ssize_t settingsSize = message.FlattenedSize();
-
- char *buffer = new char[settingsSize];
- status_t result = message.Flatten(buffer, settingsSize);
-
- fPrefsFile.Seek(0, 0);
- result = fPrefsFile.Write(buffer, (size_t)settingsSize);
- if (result != settingsSize)
- PRINT(("error writing settings, %s\n", strerror(result)));
-
- delete [] buffer;
-}
-
-
-void
-AutoMounter::_UpdateSettingsFromMessage(BMessage* message)
-{
- // auto mounter settings
-
- bool all, bfs, restore;
- if (message->FindBool("autoMountAll", &all) != B_OK)
- all = true;
- if (message->FindBool("autoMountAllBFS", &bfs) != B_OK)
- bfs = false;
-
- fRemovableMode = _ToMode(all, bfs, false);
-
- // initial mount settings
-
- if (message->FindBool("initialMountAll", &all) != B_OK)
- all = false;
- if (message->FindBool("initialMountAllBFS", &bfs) != B_OK)
- bfs = false;
- if (message->FindBool("initialMountRestore", &restore) != B_OK)
- restore = true;
-
- fNormalMode = _ToMode(all, bfs, restore);
-}
-
-
-void
-AutoMounter::GetSettings(BMessage *message)
-{
- message->MakeEmpty();
-
- bool all, bfs, restore;
-
- _FromMode(fNormalMode, all, bfs, restore);
- message->AddBool("initialMountAll", all);
- message->AddBool("initialMountAllBFS", bfs);
- message->AddBool("initialMountRestore", restore);
-
- _FromMode(fRemovableMode, all, bfs, restore);
- message->AddBool("autoMountAll", all);
- message->AddBool("autoMountAllBFS", bfs);
-
- // Save mounted volumes so we can optionally mount them on next
- // startup
- BVolumeRoster volumeRoster;
- BVolume volume;
- while (volumeRoster.GetNextVolume(&volume) == B_OK) {
- fs_info info;
- if (fs_stat_dev(volume.Device(), &info) == 0
- && (info.flags & (B_FS_IS_REMOVABLE |
B_FS_IS_PERSISTENT)) != 0) {
- message->AddString(info.device_name, info.volume_name);
-
- BString mountFlagsKey(info.device_name);
- mountFlagsKey << kMountFlagsKeyExtension;
- uint32 mountFlags = 0;
- if (volume.IsReadOnly())
- mountFlags |= B_MOUNT_READ_ONLY;
- message->AddInt32(mountFlagsKey.String(), mountFlags);
- }
- }
-}
-
-
-void
-AutoMounter::MessageReceived(BMessage* message)
-{
- switch (message->what) {
- case kMsgInitialScan:
- _MountVolumes(fNormalMode, fRemovableMode, true);
- be_app->PostMessage(kOpenPreviouslyOpenWindows);
- break;
-
- case kMountVolume:
- _MountVolume(message);
- break;
-
- case kUnmountVolume:
- _UnmountAndEjectVolume(message);
- break;
-
- case kSetAutomounterParams:
- {
- bool rescanNow = false;
- message->FindBool("rescanNow", &rescanNow);
-
- _UpdateSettingsFromMessage(message);
- GetSettings(&fSettings);
- _WriteSettings();
-
- if (rescanNow)
- _MountVolumes(fNormalMode, fRemovableMode);
- break;
- }
-
- case kMountAllNow:
- _MountVolumes(kAllVolumes, kAllVolumes);
- break;
-
- case B_DEVICE_UPDATE:
- int32 event;
- if (message->FindInt32("event", &event) != B_OK
- || (event != B_DEVICE_MEDIA_CHANGED
- && event != B_DEVICE_ADDED))
- break;
-
- partition_id deviceID;
- if (message->FindInt32("id", &deviceID) != B_OK)
- break;
-
- _MountVolumes(kNoVolumes, fRemovableMode, false,
deviceID);
- break;
-
-#if 0
- case B_NODE_MONITOR:
- {
- int32 opcode;
- if (message->FindInt32("opcode", &opcode) != B_OK)
- break;
-
- switch (opcode) {
- // The name of a mount point has changed
- case B_ENTRY_MOVED: {
- WRITELOG(("*** Received Mount Point
Renamed Notification"));
-
- const char *newName;
- if (message->FindString("name",
&newName) != B_OK) {
- WRITELOG(("ERROR: Couldn't find
name field in update message"));
- PRINT_OBJECT(*message);
- break ;
- }
-
- //
- // When the node monitor reports a
move, it gives the
- // parent device and inode that moved.
The problem is
- // that the inode is the inode of root
*in* the filesystem,
- // which is generally always the same
number for every
- // filesystem of a type.
- //
- // What we'd really like is the device
that the moved
- // volume is mounted on. Find this by
using the
- // *new* name and directory, and then
stat()ing that to
- // find the device.
- //
- dev_t parentDevice;
- if (message->FindInt32("device",
&parentDevice) != B_OK) {
- WRITELOG(("ERROR: Couldn't find
'device' field in update"
- " message"));
- PRINT_OBJECT(*message);
- break;
- }
-
- ino_t toDirectory;
- if (message->FindInt64("to directory",
&toDirectory)!=B_OK){
- WRITELOG(("ERROR: Couldn't find
'to directory' field in update"
- "message"));
- PRINT_OBJECT(*message);
- break;
- }
-
- entry_ref root_entry(parentDevice,
toDirectory, newName);
-
- BNode entryNode(&root_entry);
- if (entryNode.InitCheck() != B_OK) {
- WRITELOG(("ERROR: Couldn't
create mount point entry node: %s/n",
-
strerror(entryNode.InitCheck())));
- break;
- }
-
- node_ref mountPointNode;
- if
(entryNode.GetNodeRef(&mountPointNode) != B_OK) {
- WRITELOG(("ERROR: Couldn't get
node ref for new mount point"));
- break;
- }
-
- WRITELOG(("Attempt to rename device %li
to %s", mountPointNode.device,
- newName));
-
- Partition *partition =
FindPartition(mountPointNode.device);
- if (partition != NULL) {
- WRITELOG(("Found device,
changing name."));
-
- BVolume
mountVolume(partition->VolumeDeviceID());
- BDirectory mountDir;
-
mountVolume.GetRootDirectory(&mountDir);
- BPath dirPath(&mountDir, 0);
-
-
partition->SetMountedAt(dirPath.Path());
-
partition->SetVolumeName(newName);
- break;
- } else {
- WRITELOG(("ERROR: Device %li
does not appear to be present",
- mountPointNode.device));
- }
- }
- }
- break;
- }
-#endif
-
- default:
- BLooper::MessageReceived(message);
- break;
- }
-}
-
-
-bool
-AutoMounter::QuitRequested()
-{
- if (!BootedInSafeMode()) {
- // don't write out settings in safe mode - this would overwrite
the
- // normal, non-safe mode settings
- _WriteSettings();
- }
-
- return true;
-}
Modified: haiku/trunk/src/kits/tracker/AutoMounter.h
===================================================================
--- haiku/trunk/src/kits/tracker/AutoMounter.h 2009-10-12 14:47:16 UTC (rev
33554)
+++ haiku/trunk/src/kits/tracker/AutoMounter.h 2009-10-12 14:52:17 UTC (rev
33555)
@@ -1,108 +0,0 @@
-/*
-Open Tracker License
-
-Terms and Conditions
-
-Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice applies to all licensees
-and shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF TITLE, MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-BE INCORPORATED BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN
CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Be Incorporated shall not be
-used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from Be Incorporated.
-
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
trademarks
-of Be Incorporated in the United States and other countries. Other brand
product
-names are registered trademarks or trademarks of their respective holders.
-All rights reserved.
-*/
-
-#ifndef _AUTO_MOUNTER_H
-#define _AUTO_MOUNTER_H
-
-#include <DiskDeviceDefs.h>
-#include <File.h>
-#include <Looper.h>
-#include <Message.h>
-
-class BPartition;
-class BPath;
-
-namespace BPrivate {
-
-const uint32 kMountVolume = 'mntv';
-const uint32 kMountAllNow = 'mntn';
-const uint32 kSetAutomounterParams = 'pmst';
-const uint32 kVolumeMounted = 'vmtd';
-
-
-class AutoMounter : public BLooper {
-public:
- AutoMounter();
- virtual ~AutoMounter();
-
- virtual bool QuitRequested();
-
- void GetSettings(BMessage*
message);
-
-private:
- enum mount_mode {
- kNoVolumes,
- kOnlyBFSVolumes,
- kAllVolumes,
- kRestorePreviousVolumes
- };
-
- void
_MountVolumes(mount_mode normal,
-
mount_mode removable,
- bool
initialRescan = false,
-
partition_id deviceID = -1);
- void _MountVolume(const
BMessage* message);
- bool
_SuggestForceUnmount(const char* name,
-
status_t error);
- void
_ReportUnmountError(const char* name,
-
status_t error);
- void
_UnmountAndEjectVolume(BPartition* partition,
- BPath&
mountPoint, const char* name);
- void
_UnmountAndEjectVolume(BMessage* message);
-
- void _FromMode(mount_mode
mode, bool& all,
- bool&
bfs, bool& restore);
- mount_mode _ToMode(bool all, bool
bfs,
- bool
restore = false);
-
- void
_UpdateSettingsFromMessage(BMessage* message);
- void _ReadSettings();
- void _WriteSettings();
-
- virtual void MessageReceived(BMessage*
message);
-
-private:
- mount_mode fNormalMode;
- mount_mode fRemovableMode;
-
- BFile fPrefsFile;
- BMessage fSettings;
-};
-
-
-} // namespace BPrivate
-
-using namespace BPrivate;
-
-#endif // _AUTO_MOUNTER_H
Modified: haiku/trunk/src/kits/tracker/AutoMounterSettings.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/AutoMounterSettings.cpp 2009-10-12
14:47:16 UTC (rev 33554)
+++ haiku/trunk/src/kits/tracker/AutoMounterSettings.cpp 2009-10-12
14:52:17 UTC (rev 33555)
@@ -32,177 +32,182 @@
All rights reserved.
*/
-
-#include "AutoMounter.h"
#include "AutoMounterSettings.h"
+#include <Alert.h>
#include <Box.h>
#include <Button.h>
+#include <CheckBox.h>
#include <Debug.h>
+#include <GridLayoutBuilder.h>
+#include <GroupLayoutBuilder.h>
+#include <SpaceLayoutItem.h>
+#include <SeparatorView.h>
#include <Message.h>
#include <RadioButton.h>
#include <Window.h>
+#include <MountServer.h>
+
const uint32 kAutomountSettingsChanged = 'achg';
const uint32 kBootMountSettingsChanged = 'bchg';
-const uint32 kAutoAll = 'aall';
-const uint32 kAutoBFS = 'abfs';
-const uint32 kAutoHFS = 'ahfs';
-const uint32 kInitAll = 'iall';
-const uint32 kInitBFS = 'ibfs';
-const uint32 kInitHFS = 'ihfs';
+const uint32 kEjectWhenUnmountingChanged = 'ejct';
+
class AutomountSettingsPanel : public BBox {
- public:
- AutomountSettingsPanel(BRect, BMessage *, AutoMounter *);
- virtual ~AutomountSettingsPanel();
+public:
+
AutomountSettingsPanel(BMessage* settings,
+ const
BMessenger& target);
+ virtual
~AutomountSettingsPanel();
- protected:
- virtual void MessageReceived(BMessage *);
- virtual void AttachedToWindow();
- virtual void GetPreferredSize(float* _width, float* _height);
-
- private:
- void SendSettings(bool rescan);
-
- BRadioButton *fInitialDontMountCheck;
- BRadioButton *fInitialMountAllBFSCheck;
- BRadioButton *fInitialMountAllCheck;
- BRadioButton *fInitialMountRestoreCheck;
+protected:
+ virtual void MessageReceived(BMessage*
message);
+ virtual void AttachedToWindow();
[... truncated: 1174 lines follow ...]
Other related posts:
