macOS CI: surface installer logs on failure

.github/workflows/ghcr.yml

@@ -33,14 +33,14 @@ jobs:
 
       - name: Extract tags and labels for base image
         id: meta_base
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ${{ env.REGISTRY }}/${{ env.BASE_IMAGE }}
           tags: type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Extract tags and labels for archive image
         id: meta_archive
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ${{ env.REGISTRY }}/${{ env.ARCHIVE_IMAGE }}
           tags: type=raw,value=latest,enable={{is_default_branch}}

.github/workflows/macOS.yml

@@ -105,7 +105,12 @@ jobs:
           echo "Found PKG: $PKG_PATH"
 
           # Install (sudo is passwordless in GitHub Actions)
-          sudo installer -pkg "$PKG_PATH" -target / -verbose
+          sudo installer -pkg "$PKG_PATH" -target / -verbose -dumplog
+      - name: Debug on install failure
+        if: failure() && steps.install-test.conclusion == 'failure'
+        run: |
+          echo "=== /var/log/install.log (last 100 lines) ==="
+          sudo tail -100 /var/log/install.log
       - name: Verify Installation
         if: success() && steps.install-test.conclusion == 'success'
         run: |

.github/workflows/quay.yml

@@ -33,14 +33,14 @@ jobs:
 
       - name: Extract tags and labels for base image
         id: meta_base
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ${{ env.REGISTRY }}/${{ env.BASE_IMAGE }}
           tags: type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Extract tags and labels for archive image
         id: meta_archive
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ${{ env.REGISTRY }}/${{ env.ARCHIVE_IMAGE }}
           tags: type=raw,value=latest,enable={{is_default_branch}}

build/mac/io.pcp.pmcd.plist

@@ -7,13 +7,8 @@
         <key>ProgramArguments</key>
         <array>
             <string>/etc/init.d/pmcd</string>
-            <string>start</string>
+            <string>start-launchd</string>
         </array>
-        <key>EnvironmentVariables</key>
-        <dict>
-            <key>LAUNCHED_BY_LAUNCHD</key>
-            <string>1</string>
-        </dict>
         <key>Disabled</key>
         <false/>
         <key>UserName</key>

build/mac/io.pcp.pmproxy.plist

@@ -7,13 +7,8 @@
         <key>ProgramArguments</key>
         <array>
             <string>/etc/init.d/pmproxy</string>
-            <string>start</string>
+            <string>start-launchd</string>
         </array>
-        <key>EnvironmentVariables</key>
-        <dict>
-            <key>LAUNCHED_BY_LAUNCHD</key>
-            <string>1</string>
-        </dict>
         <key>Disabled</key>
         <false/>
         <key>UserName</key>

build/mac/qa/TESTING.md

@@ -58,10 +58,7 @@ wait_pmcd() {
 ### Test 1: Verify Configuration Changes
 
 ```bash
-# Check plist has environment variable and KeepAlive
-cat /Library/LaunchDaemons/io.pcp.pmcd.plist | grep -A4 EnvironmentVariables
-# Should show: LAUNCHED_BY_LAUNCHD = 1
-
+# Check plist has KeepAlive
 cat /Library/LaunchDaemons/io.pcp.pmcd.plist | grep -A1 KeepAlive
 # Should show: <true/>
 ```
@@ -87,9 +84,9 @@ wait_pmcd
 # Verify pmcd is running
 ps aux | grep pmcd | grep -v grep
 
-# Check that pmcd is running with -f flag (foreground mode)
-ps aux | grep '[p]mcd' | grep -- '-f'
-# Should see the -f flag in the command line
+# Check that pmcd is running with -F flag (foreground mode)
+ps aux | grep '[p]mcd' | grep -- '-F'
+# Should see the -F flag in the command line
 
 # Verify exactly one pmcd process (no fork issues)
 echo "pmcd process count: $(ps aux | grep '[p]mcd' | wc -l | tr -d ' ')"
@@ -202,8 +199,8 @@ pminfo -f pmcd.version
 
 ## Expected Results Summary
 
-✅ **Configuration**: LAUNCHED_BY_LAUNCHD env var present, KeepAlive = true
-✅ **Foreground mode**: pmcd runs with `-f` flag
+✅ **Configuration**: KeepAlive = true
+✅ **Foreground mode**: pmcd runs with `-F` flag
 ✅ **No fork issues**: Only one pmcd process exists
 ✅ **launchctl tracking**: Service shows in `launchctl list` with PID
 ✅ **KeepAlive works**: pmcd automatically restarts after crash
@@ -240,5 +237,5 @@ Check if rc_pmcd is detecting it:
 sudo launchctl unload /Library/LaunchDaemons/io.pcp.pmcd.plist
 sudo launchctl load /Library/LaunchDaemons/io.pcp.pmcd.plist
 wait_pmcd
-ps aux | grep '[p]mcd'  # Should show -f flag
+ps aux | grep '[p]mcd'  # Should show -F flag
 ```

build/mac/qa/test-pmcd-launchctl.sh

@@ -88,13 +88,6 @@ if [ ! -f "$PLIST_PATH" ]; then
     exit 1
 fi
 
-if grep -q "LAUNCHED_BY_LAUNCHD" "$PLIST_PATH"; then
-    echo "✓ LAUNCHED_BY_LAUNCHD environment variable present"
-else
-    echo "✗ LAUNCHED_BY_LAUNCHD environment variable missing"
-    exit 1
-fi
-
 if grep -A1 "KeepAlive" "$PLIST_PATH" | grep -q "<true/>"; then
     echo "✓ KeepAlive enabled"
 else
@@ -137,13 +130,13 @@ else
     exit 1
 fi
 
-# Test 3: Verify foreground mode
-echo -e "\n[Test 3] Verifying foreground mode..."
+# Test 3: Verify managed mode
+echo -e "\n[Test 3] Verifying managed mode..."
 
-if ps aux | grep '[p]mcd' | grep -q -- '-f'; then
-    echo "✓ pmcd running in foreground mode (-f flag present)"
+if ps aux | grep '[p]mcd' | grep -q -- '-F'; then
+    echo "✓ pmcd running in managed mode (-F flag present)"
 else
-    echo "⚠ Warning: pmcd not running with -f flag"
+    echo "⚠ Warning: pmcd not running with -F flag"
     echo "Command line: $(ps aux | grep '[p]mcd')"
 fi
 
@@ -303,8 +296,8 @@ fi
 echo -e "\n=== All tests passed! ==="
 echo ""
 echo "Summary:"
-echo "  ✓ Configuration correct (LAUNCHED_BY_LAUNCHD + KeepAlive)"
-echo "  ✓ pmcd runs in foreground mode (-f flag)"
+echo "  ✓ Configuration correct (KeepAlive)"
+echo "  ✓ pmcd runs in managed mode (-F flag)"
 echo "  ✓ No fork issues (single pmcd process)"
 echo "  ✓ launchctl properly tracks pmcd"
 echo "  ✓ pmcd responds to queries"

build/nix/package.nix

@@ -165,7 +165,6 @@ pkgs.stdenv.mkDerivation rec {
     perl
     rrdtool
   ] ++ lib.optionals pkgs.stdenv.isLinux [
-    avahi
     lvm2
   ] ++ lib.optionals withSystemd [
     systemd

build/rpm/GNUmakefile

@@ -99,7 +99,6 @@ pcp.spec: pcp.spec.in
 	    -e's|@enable_systemd@|$(ENABLE_SYSTEMD)|g' \
 	    -e's|@enable_secure@|$(ENABLE_SECURE)|g' \
 	    -e's|@enable_probes@|$(ENABLE_PROBES)|g' \
-	    -e's|@enable_avahi@|$(ENABLE_AVAHI)|g' \
 	    -e's|@enable_dstat@|$(ENABLE_DSTAT)|g' \
 	    -e's|@enable_qt@|$(ENABLE_QT)|g' \
 	    -e's|@enable_selinux@|$(ENABLE_SELINUX)|g' \

build/rpm/pcp.spec.in

@@ -65,9 +65,6 @@ BuildRequires: procps autoconf bison flex
 
 BuildRequires: rpm-build
 
-%if "@enable_avahi@" == "true"
-BuildRequires: avahi-devel
-%endif
 %if "@enable_lzma@" == "true"
 BuildRequires: xz-devel
 %endif

build/rpm/redhat.spec

@@ -226,7 +226,6 @@ Obsoletes: pcp-pmda-nvidia < 3.10.5
 BuildRequires: make
 BuildRequires: gcc gcc-c++
 BuildRequires: procps autoconf bison flex
-BuildRequires: avahi-devel
 BuildRequires: xz-devel
 BuildRequires: zlib-devel
 %if !%{disable_python3}