From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 1 Apr 2011 16:17:13 +0000 (-0400)
Subject: macos: no more startupitems
X-Git-Tag: upstream/1.6.1.pre1^2~71
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7c37f71c287e99aa256dd1a40833f1bb1d10b629;p=packages%2Fo%2Fopenafs.git

macos: no more startupitems

if we're upgrading, a "cruft" startupitems script should just
be nuked.

FIXES 129601

Reviewed-on: http://gerrit.openafs.org/4387
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 841c8022e3978fffe1357f339d948e93c9db9d52)

Change-Id: Ibe2dde067df1fe22da1bb09039d07ebbc178af08
Reviewed-on: http://gerrit.openafs.org/6277
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/packaging/MacOS/OpenAFS.pre_upgrade b/src/packaging/MacOS/OpenAFS.pre_upgrade
index bd030fc72..2877dc697 100644
--- a/src/packaging/MacOS/OpenAFS.pre_upgrade
+++ b/src/packaging/MacOS/OpenAFS.pre_upgrade
@@ -29,6 +29,7 @@ fi
 
 if [ -f /Library/StartupItems/OpenAFS/OpenAFS ]; then
   /Library/StartupItems/OpenAFS/OpenAFS stop
+  rm /Library/StartupItems/OpenAFS/OpenAFS
 else
   if [ -f /Library/LaunchDaemons/org.openafs.filesystems.afs.plist ]; then
 	if ps ax | grep -v grep | grep $DAEMON > /dev/null