From 293ffd73ea6cab6dfdae1f2b1faeebfb07c060b8 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 Mar 2026 15:32:59 +0000
Subject: [PATCH] autopkgtests: Break out test-service-startup-prep

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 adt/acommon        | 15 +++++++++++++++
 adt/adt-initscript | 13 +------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/adt/acommon b/adt/acommon
index 83e2272..b0edb5d 100644
--- a/adt/acommon
+++ b/adt/acommon
@@ -35,6 +35,21 @@ test-prep () {
     fi
 }
 
+test-service-startup-prep () {
+    rsyslog-capture-daemon
+    service rsyslog force-reload
+
+    perl <test/test.cfg >/etc/hippotat/main.cfg -pe '
+	    s{^addrs *=.*}{addrs = 127.0.0.1};
+    '
+
+    cat >>/etc/default/hippotatd <<END
+    set -x
+    CHECK_FIREWALL=false
+    USER=root
+END
+}
+
 filesystem-prep () {
     cs=$1; shift
     # expects $tmp to be set to test-specific temp dir (abs path)
diff --git a/adt/adt-initscript b/adt/adt-initscript
index 9263053..0bf60a0 100755
--- a/adt/adt-initscript
+++ b/adt/adt-initscript
@@ -7,18 +7,7 @@ set -e
 
 test-prep
 
-rsyslog-capture-daemon
-service rsyslog force-reload
-
-perl <test/test.cfg >/etc/hippotat/main.cfg -pe '
-	s{^addrs *=.*}{addrs = 127.0.0.1};
-'
-
-cat >>/etc/default/hippotatd <<END
-set -x
-CHECK_FIREWALL=false
-USER=root
-END
+test-service-startup-prep
 
 # hippotatd is not actually running now because the init script checks
 # if we have any configured endpoints, and doesn't run it if not.
-- 
2.30.2