From f0ce809181d19e865817200dab4fb8370bceeb59 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sat, 27 Feb 2010 20:09:42 -0500 Subject: [PATCH] macos prefs pane more reliable running indicator instead of grepping ps output, look for AFS in df output. not happy with this either but it's way more reliable. Change-Id: I73ff53bc1cc24c9484011a870546b6334ff66b49 Reviewed-on: http://gerrit.openafs.org/1410 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/platform/DARWIN/AFSPreference/AFSPropertyManager.h | 1 + src/platform/DARWIN/AFSPreference/AFSPropertyManager.m | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.h b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.h index 7a733dfc5..000938704 100644 --- a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.h +++ b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.h @@ -13,6 +13,7 @@ #define AFS_DAEMON_STARTUPSCRIPT "/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.rc" #define AFS_DAEMON_PATH "/Library/LaunchDaemons/org.openafs.filesystems.afs.plist" +#define AFS_FS_MOUNT "AFS" #define AFS_DAEMON_LAUNCH_PATH "/private/var/db/openafs/etc/launchafs.sh" /*! @class AFSPropertyManager diff --git a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m index 4da7e66cb..a5fb45e3d 100644 --- a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m +++ b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m @@ -1370,8 +1370,8 @@ // ------------------------------------------------------------------------------- -(BOOL) checkAfsStatusForStartup { BOOL result = NO; - NSString *fsResult = [TaskUtil executeTaskSearchingPath:@"ps" args:[NSArray arrayWithObjects:@"-ef", nil]]; - result = (fsResult?([fsResult rangeOfString:@AFS_DAEMON_LAUNCH_PATH].location != NSNotFound):NO); + NSString *dfResult = [TaskUtil executeTaskSearchingPath:@"/bin/df" args:[NSArray arrayWithObjects:nil]]; + result = (dfResult?([dfResult rangeOfString:@AFS_FS_MOUNT].location != NSNotFound):NO); return result; } -- 2.39.5