diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-07 10:44:17 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-07 17:47:42 +0000 |
| commit | 9cf44c19d00e1072e28e353a4c8fcdd22e01e554 (patch) | |
| tree | 7f295f7851abfdc105dfc0cad600ea67a99e45fe /packaging | |
| parent | a8df07c29fd01493107e85df0f0eb71311142d74 (diff) | |
| download | wireshark-9cf44c19d00e1072e28e353a4c8fcdd22e01e554.tar.gz | |
Only nuke the startup item once we've installed the launch daemon.
That way, if we crash in the middle, there's still something installed
that will try to set the permissions on the BPF devices.
Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411
Reviewed-on: https://code.wireshark.org/review/2023
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 39ca18d71b85d0b99c0fd3c5edab48fa217d7d34)
Reviewed-on: https://code.wireshark.org/review/2024
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/Scripts/chmodbpf-postinstall.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/macosx/Scripts/chmodbpf-postinstall.sh b/packaging/macosx/Scripts/chmodbpf-postinstall.sh index c7f48a4cb2..08631b3fd1 100755 --- a/packaging/macosx/Scripts/chmodbpf-postinstall.sh +++ b/packaging/macosx/Scripts/chmodbpf-postinstall.sh @@ -4,8 +4,6 @@ CHMOD_BPF="/Library/LaunchDaemons/org.wireshark.ChmodBPF.plist" BPF_GROUP="access_bpf" BPF_GROUP_NAME="BPF device access ACL" -rm -rf /Library/StartupItems/ChmodBPF - dscl . -read /Groups/"$BPF_GROUP" > /dev/null 2>&1 || \ dseditgroup -q -o create "$BPF_GROUP" dseditgroup -q -o edit -a "$USER" -t user "$BPF_GROUP" @@ -15,4 +13,6 @@ cp "/Library/Application Support/Wireshark/ChmodBPF/org.wireshark.ChmodBPF.plist chmod 755 "$CHMOD_BPF" chown root:wheel "$CHMOD_BPF" +rm -rf /Library/StartupItems/ChmodBPF + launchctl load "$CHMOD_BPF" |