From afa09b720058b99bec2c8bc200477ef5dbe75bde Mon Sep 17 00:00:00 2001
From: ljm42 <larry_meaney@iname.com>
Date: Tue, 2 Dec 2025 14:06:56 -0700
Subject: [PATCH] refactor: remove numeric prefixes on hosts.d files

---
 etc/rc.d/rc.S.cont      |  5 ++---
 etc/rc.d/rc.avahidaemon |  2 +-
 sbin/rebuild_hosts      | 13 ++++++-------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/etc/rc.d/rc.S.cont b/etc/rc.d/rc.S.cont
index 0c550e58e..b44429a79 100755
--- a/etc/rc.d/rc.S.cont
+++ b/etc/rc.d/rc.S.cont
@@ -229,9 +229,8 @@ fi
 /bin/mkdir -p /etc/hosts.d
 {
   /bin/echo "# Do not edit, generated by rc.S.cont"
-  /bin/echo "127.0.0.1 ${NAME} localhost"
-  /bin/echo "::1 localhost"
-} >/etc/hosts.d/00-base
+  /bin/echo "127.0.0.1 ${NAME}"
+} >/etc/hosts.d/hostname
 /usr/local/sbin/rebuild_hosts
 
 # LimeTech - restore the configured timezone
diff --git a/etc/rc.d/rc.avahidaemon b/etc/rc.d/rc.avahidaemon
index dfbd1f9ee..69814edbc 100755
--- a/etc/rc.d/rc.avahidaemon
+++ b/etc/rc.d/rc.avahidaemon
@@ -30,7 +30,7 @@ DAEMON="Avahi mDNS/DNS-SD daemon"
 CALLER="avahi"
 AVAHI="/usr/sbin/avahi-daemon"
 CONF="/etc/avahi/avahi-daemon.conf"
-HOSTS="/etc/hosts.d/05-avahi"
+HOSTS="/etc/hosts.d/avahi"
 NAME=$(</etc/HOSTNAME)
 
 # run & log functions
diff --git a/sbin/rebuild_hosts b/sbin/rebuild_hosts
index d40e4ac67..c2687b369 100644
--- a/sbin/rebuild_hosts
+++ b/sbin/rebuild_hosts
@@ -19,7 +19,7 @@ set -euo pipefail
 # run & log functions
 . /etc/rc.d/rc.runlog
 
-trap 'log "rebuild_hosts FAILED with status $? (see previous log lines for context)" || true' ERR
+trap 'log "rebuild_hosts FAILED with status $? (see previous log lines for context)"' ERR
 
 HOSTS_DIR=/etc/hosts.d
 HOSTS_FILE=/etc/hosts
@@ -88,7 +88,7 @@ add_hosts_line() {
   IP_TO_HOSTS["$ip"]="${current_hosts# }"
 
   # Track which fragment files contributed to this IP.
-  # This is just for the trailing "# from 00-base 10-avahi" comment.
+  # This is just for the trailing "# from hostname avahi" comment.
   if [[ -n "$CURRENT_SOURCE" ]]; then
     local current_sources="${IP_TO_SOURCES[$ip]:-}"
 
@@ -145,11 +145,10 @@ for f in "${fragment_files[@]}"; do
   process_file "$f"
 done
 
-# If no fragments defined any IPs, provide a minimal fallback
-if [[ ${#IP_ORDER[@]} -eq 0 ]]; then
-  CURRENT_SOURCE="fallback"
-  add_hosts_line "127.0.0.1" "localhost"
-fi
+# Define the minimum
+CURRENT_SOURCE="builtin"
+add_hosts_line "127.0.0.1" "localhost"
+add_hosts_line "::1" "localhost"
 
 # Emit merged lines in original IP discovery order
 for ip in "${IP_ORDER[@]}"; do