Revert "adt-full: Use /etc/init.d/ to start services"

This reverts commit 2c44e7af7023a17c7d906e79d9ed6e9859fcebc3.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/adt/acommon b/adt/acommon
index 3d3712c15c639c2ce1d1853ff6da1d6cdda3df47..69c0f1891d4a667015bcc8b8ba71fbd5b1c2e219 100644 (file)
--- a/adt/acommon
+++ b/adt/acommon
@@ -152,8 +152,8 @@ setup-host () {
     in- $cs apt-mark auto $unwanted_deps
     in- $cs apt-get -y autoremove
 
-    in- $cs /etc/init.d/userv start
-    in- $cs /etc/init.d/rsyslog start
+    in- $cs service userv start
+    in- $cs service rsyslog start
 
     configure $cs
 

diff --git a/adt/adt-full b/adt/adt-full
index e1654b8d7128d0b31d852ff5c7e9ac879a55e7d7..e764fe8c99d313a0d2ae9c7a3f1fadd148df3843 100755 (executable)
--- a/adt/adt-full
+++ b/adt/adt-full
@@ -13,7 +13,7 @@ setup-pair
 
 in- server sh -x /etc/init.d/userv start
 
-in- server /etc/init.d/hippotatd restart
+in- server service hippotatd restart
 
 in-ns-await-up server 192.0.2.1