From 979f03189a6242fabbc755359b74a8dca74cd8b3 Mon Sep 17 00:00:00 2001
From: Andy Fiddaman <omnios@citrus-it.co.uk>
Date: Sun, 1 Mar 2020 15:27:37 +0000
Subject: [PATCH] Disable varpd service in installer

---
 build/build_miniroot | 12 ++++++++----
 data/baseline        |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/build_miniroot b/build/build_miniroot
index 1eaa161..c239467 100755
--- a/build/build_miniroot
+++ b/build/build_miniroot
@@ -309,11 +309,14 @@ step() {
         -d ${ROOTDIR}/lib/svc/manifest
     /bin/rm -f /tmp/manifest-import.$$
 
-    echo " --- neutering boot-archive"
-    ${SVCCFG} -s 'system/boot-archive' setprop 'start/exec=:true'
+    for s in system/boot-archive \
+        system/manifest-import \
+        network/varpd
+    do
+        echo " --- neutering $s"
+        ${SVCCFG} -s "$s" setprop 'start/exec=:true'
+    done
 
-    echo " --- neutering the manifest import"
-    ${SVCCFG} -s 'system/manifest-import' setprop 'start/exec=:true'
     echo "#!/bin/ksh" > ${ROOTDIR}/lib/svc/method/manifest-import
     echo "exit 0" >> ${ROOTDIR}/lib/svc/method/manifest-import
     chmod 555 ${ROOTDIR}/lib/svc/method/manifest-import
@@ -388,6 +391,7 @@ EOM
         echo "-- SANITY CHECK FAILED, see above"
         echo
         mv $of $WORKDIR/sanity.baseline
+        chmod go+r $WORKDIR/sanity.baseline
         exit 1
     fi
     rm -f $of
diff --git a/data/baseline b/data/baseline
index 4c196fe..6367a07 100644
--- a/data/baseline
+++ b/data/baseline
@@ -7,6 +7,7 @@ Missing dependency for lib/inet/in.mpathd - libipmp.so.1 [LAZY]
 Missing dependency for lib/ld.so.1 - libld.so.4 [LAZY]
 Missing dependency for lib/ld.so.1 - liblddbg.so.4 [LAZY]
 Missing dependency for lib/ld.so.1 - librtld.so.1 [LAZY]
+Missing dependency for lib/libdladm.so.1 - libvarpd.so.1 [LAZY]
 Missing dependency for lib/svc/method/svc-stmf - libstmf.so.1 [LAZY]
 Missing dependency for sbin/bootadm - libficl-sys.so.4.1.0 [LAZY]
 Missing dependency for sbin/dladm - librstp.so.1 [LAZY]