From 79784a67438f126aa6fe418bd105be291e901b74 Mon Sep 17 00:00:00 2001
From: Jino Jose <jinojose@Jinos-MacBook-Pro.local>
Date: Thu, 25 Jun 2026 15:29:50 +0530
Subject: [PATCH] Move avahi install out of autoinstall phase

---
 ansible/roles/base/tasks/main.yml | 1 +
 autoinstall/user-data             | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml
index b846504..51ed1d8 100644
--- a/ansible/roles/base/tasks/main.yml
+++ b/ansible/roles/base/tasks/main.yml
@@ -16,6 +16,7 @@
       - curl
       - wget
       - git
+      - avahi-daemon
       - build-essential
       - ca-certificates
       - gnupg
diff --git a/autoinstall/user-data b/autoinstall/user-data
index db4c02e..24fac4d 100644
--- a/autoinstall/user-data
+++ b/autoinstall/user-data
@@ -51,7 +51,6 @@ autoinstall:
     - wget
     - python3
     - whiptail
-    - avahi-daemon
     - openssh-server
 
   # ── Late commands ─────────────────────────────
@@ -96,7 +95,8 @@ autoinstall:
     - cp /target/opt/aipackage/autoinstall/firstboot-setup.sh /target/opt/cezen/firstboot-setup.sh
     - chmod +x /target/opt/cezen/firstboot-setup.sh
 
-    # Set hostname to cezenai so it's reachable as cezenai.local via mDNS
+    # Set hostname to cezenai. mDNS is installed later by our own stack setup
+    # instead of during Subiquity's package phase, which has been flaky.
     - echo "cezenai" > /target/etc/hostname
     - sed -i 's/aiserver/cezenai/g' /target/etc/hosts || true
 
@@ -105,7 +105,7 @@ autoinstall:
       cat > /target/etc/systemd/system/cezen-setup.service << 'EOF'
       [Unit]
       Description=Cezen AI Suite — Console Setup Wizard
-      After=cloud-final.service cloud-init.target network-online.target avahi-daemon.service
+      After=cloud-final.service cloud-init.target network-online.target
       Wants=cloud-init.target network-online.target
       Conflicts=getty@tty1.service
       ConditionPathExists=!/opt/cezen/.setup-done
@@ -129,7 +129,6 @@ autoinstall:
 
     - curtin in-target -- systemctl enable ssh
     - curtin in-target -- systemctl enable cezen-setup.service
-    - curtin in-target -- systemctl enable avahi-daemon.service
 
   # ── Skip confirmations ─────────────────────────
   user-data: