diff --git a/pkg/packaging/assets/preinstall-darwin.sh b/pkg/packaging/assets/preinstall-darwin.sh deleted file mode 100755 index 4f153739a..000000000 --- a/pkg/packaging/assets/preinstall-darwin.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -# As of the Big Sur general release, Apple M1 machines no longer ship -# Rosetta 2. Instead, this must be installed manually. As osquery does -# not yet ship a universal binary, launcher requires rosetta2. -# -# During an interactive install, the user is prompted to okay a -# rosetta2 install, but this does not appear to happen during an MDM -# install. So, we need to trigger than from a preinstall script. - -# If we're not arm, exit -if [ "$(/usr/bin/arch)" != "arm64" ]; then - exit 0 -fi - -# If it's already installed, exit. If this check misfires, we'll -# invoke software update an extra time, which should be okay. -if [[ -f "/Library/Apple/System/Library/LaunchDaemons/com.apple.oahd.plist" ]]; then - exit 0 -fi - -# At some point the oahd plist vanished. Another way to check is to -# see is oahd is running -if /usr/bin/pgrep -q oahd; then - exit 0 -fi - -# report errors -set -e - -/usr/sbin/softwareupdate --install-rosetta --agree-to-license diff --git a/pkg/packaging/packaging.go b/pkg/packaging/packaging.go index 30e845149..50d8d4c0b 100644 --- a/pkg/packaging/packaging.go +++ b/pkg/packaging/packaging.go @@ -290,10 +290,6 @@ func (p *PackageOptions) Build(ctx context.Context, packageWriter io.Writer, tar return errors.Wrapf(err, "setup init script for %s", p.target.String()) } - if err := p.setupPreinst(ctx); err != nil { - return errors.Wrapf(err, "setup preinst for %s", p.target.String()) - } - if err := p.setupPostinst(ctx); err != nil { return errors.Wrapf(err, "setup postInst for %s", p.target.String()) } @@ -605,22 +601,6 @@ func (p *PackageOptions) setupPrerm(ctx context.Context) error { return nil } -func (p *PackageOptions) setupPreinst(ctx context.Context) error { - if p.target.Platform != Darwin { - return nil - } - - preinstallContent, err := assets.ReadFile("assets/preinstall-darwin.sh") - if err != nil { - return errors.Wrap(err, "getting template for preinstall") - } - - return errors.Wrap( - ioutil.WriteFile(filepath.Join(p.scriptRoot, "preinstall"), preinstallContent, 0755), - "writing preinstall file", - ) -} - func (p *PackageOptions) setupPostinst(ctx context.Context) error { if p.target.Init == NoInit { return nil