macos13: back out NTFS-related changes (#30)

Author: delan

README.md

@@ -211,8 +211,6 @@ To prepare a server for macOS 13 guests, build a clean image:
 - Click the plus, type the password above, type `/System/Applications/Utilities/Terminal.app`, press **Enter** twice, press **Cmd**+**Q**
 - Press **Cmd**+**Space**, type `terminal`, press **Enter**
 - Type `curl https://ci0.servo.org/static/macos13.sh | sudo sh`, press **Enter**, type the password above, press **Enter**
-- When prompted: quit Terminal, click **Open System Settings**, click **Allow**, type the password above, press **Enter**, press **Cmd**+**Q**
-- Shut down the guest: `virsh shutdown servo-macos13.clean`
 - When the guest shuts down, take another snapshot: `zfs snapshot tank/base/servo-macos13.clean@automated`
 - Enable per-snapshot block devices for the zvol: `zfs set snapdev=visible tank/base/servo-macos13.clean`
 

macos13/init.sh

@@ -12,8 +12,16 @@ osascript -e 'tell application "Terminal"' -e 'activate' -e 'set the bounds of t
 sudo pmset sleep 0
 sudo pmset displaysleep 0
 
-# Fix brew error “The following directories are not writable by your user: /usr/local/share/man/man8”
-sudo chown -R servo /usr/local/share/man/man8
+# Install Xcode CLT (Command Line Tools) non-interactively
+# <https://github.com/actions/runner-images/blob/3d5f09a90fd475a3531b0ef57325aa7e27b24595/images/macos/scripts/build/install-xcode-clt.sh>
+sudo -i mkdir -p /var/root/utils
+sudo -i touch /var/root/utils/utils.sh
+sudo -i /Volumes/a/init/install-xcode-clt.sh
+
+# Install Homebrew
+if ! [ -e /usr/local/bin/brew ]; then
+    NONINTERACTIVE=1 /Volumes/a/init/install-homebrew.sh
+fi
 
 # Install gtar(1)
 brew install gnu-tar

static/macos13.sh

@@ -38,80 +38,5 @@ echo 'servo  ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/servo
 find /Users/servo/Library/Saved\ Application\ State/com.apple.Terminal.savedState -depth +0 -delete || mkdir /Users/servo/Library/Saved\ Application\ State/com.apple.Terminal.savedState
 chflags uchg /Users/servo/Library/Saved\ Application\ State/com.apple.Terminal.savedState
 
-# Install Xcode CLT (Command Line Tools) non-interactively
-# <https://github.com/actions/runner-images/blob/3d5f09a90fd475a3531b0ef57325aa7e27b24595/images/macos/scripts/build/install-xcode-clt.sh>
-if ! xcode-select -p; then (
-    mkdir -p xcode
-    cd xcode
-    mkdir -p utils
-    touch utils/utils.sh
-    curl -LO https://raw.githubusercontent.com/actions/runner-images/3d5f09a90fd475a3531b0ef57325aa7e27b24595/images/macos/scripts/build/install-xcode-clt.sh
-    chmod +x install-xcode-clt.sh
-    ./install-xcode-clt.sh
-); fi
-
-# Install Homebrew
-if ! [ -e /usr/local/bin/brew ]; then (
-    mkdir -p homebrew
-    cd homebrew
-    sudo -iu servo curl -LO https://raw.githubusercontent.com/Homebrew/install/9a01f1f361cc66159c31624df04b6772d26b7f98/install.sh
-    sudo -iu servo chmod +x install.sh
-    sudo -iu servo NONINTERACTIVE=1 ./install.sh
-); fi
-
-# Compile and install ntfs-3g
-if ! [ -e /usr/local/sbin/mkntfs ]; then (
-    mkdir -p ntfs
-    cd ntfs
-
-    # <https://github.com/tuxera/ntfs-3g/issues/130>
-    sudo -iu servo brew install autoconf automake m4 libtool pkg-config libgcrypt macfuse
-
-    curl -LO https://github.com/tuxera/ntfs-3g/archive/refs/tags/2022.10.3.tar.gz
-    rm -Rf ntfs-3g-2022.10.3
-    tar xf 2022.10.3.tar.gz
-    cd ntfs-3g-2022.10.3
-    # error: required file './ltmain.sh' not found
-    autoreconf -fi || autoreconf -fi
-    # <https://github.com/tuxera/ntfs-3g/issues/5>
-    # <https://gist.github.com/six519/9f04837f119103d4ff45542a5b5d4222>
-    LDFLAGS="-L/usr/local/lib -lintl" ./configure --exec-prefix=/usr/local
-    make -j
-    make install
-); fi
-
-# Convert /Volumes/a from exFAT to NTFS
-# First disable Spotlight so we can unmount (per `lsof +f -- /Volumes/a`)
-# <https://apple.stackexchange.com/a/444826>
-mdutil -d /Volumes/a || :
-# Check if mounted, but not by checking for existence of the mount point
-if mount | grep -q ' on /Volumes/a '; then
-    umount /Volumes/a
-fi
-/usr/local/sbin/mkntfs --quick --label a /dev/disk2s2
-
-# Write out a boot script that mounts /Volumes/a and runs /Volumes/a/init.sh
-cat > /Users/servo/boot.sh <<'END'
-#!/usr/bin/env zsh
-set -eu
-# Unmount the volume first, in case it was mounted with the built-in read-only NTFS driver
-if mount | grep -q ' on /Volumes/a '; then
-    sudo umount /Volumes/a
-fi
-sudo mkdir -p /Volumes/a
-# Mount the volume as servo:staff to avoid permission errors
-sudo ntfs-3g -o uid=501,gid=20 /dev/disk2s2 /Volumes/a
-if [ -e /Volumes/a/init/init.sh ]; then
-    /Volumes/a/init/init.sh
-else
-    echo /Volumes/a/init/init.sh does not exist
-fi
-END
-chmod +x /Users/servo/boot.sh
-
-# <https://github.com/actions/runner-images/issues/4731>
-kextload /Library/Filesystems/macfuse.fs/Contents/Extensions/$macos_version/macfuse.kext || :
-
-echo
-echo
-echo 'See the README for next steps'
+# Shut down the clean image guest
+shutdown -h now

static/macos13/org.servo.ci.plist

@@ -20,7 +20,7 @@
             <string>-Wa</string><!-- wait, application -->
             <string>/System/Applications/Utilities/Terminal.app</string>
             <!-- In practice, this actually runs as servo, not root -->
-            <string>/Users/servo/boot.sh</string>
+            <string>/Volumes/a/init/init.sh</string>
     </array>
 </dict>
 </plist>