testing: Correctly dis-/enable services with systemd

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 3ad836bdd25f316c951d5bdc18e9fb6905c250e4..2d923d596f84eae80259cba89cb45955d8912908 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -113,7 +113,12 @@ execute_chroot "apt-get -y upgrade"
 for service in $SERVICES
 do
        log_action "Disabling service $service"
-       execute_chroot "update-rc.d -f $service remove"
+       if [ "$BASEIMGSUITE" == "wheezy" ]
+       then
+               execute_chroot "update-rc.d -f $service remove"
+       else
+               execute_chroot "systemctl disable $service"
+       fi
 done
 
 log_action "Disabling root password"

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index 8a44b4f76e12ed98de887f2a28849fd68339b8f1..e2ec422b11718e659042abdfba4a06be9957f4fa 100755 (executable)
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -63,15 +63,22 @@ do
                execute_chroot "a2enmod -q cgid" 0
                execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0
                execute_chroot "/etc/openssl/generate-crl" 0
-               execute_chroot "update-rc.d apache2 defaults" 0
-               execute_chroot "update-rc.d slapd defaults" 0
                execute_chroot "rm -rf /var/lib/ldap/*" 0
                execute_chroot "slapadd -l /etc/ldap/ldif.txt -f /etc/ldap/slapd.conf" 0
                execute_chroot "chown -R openldap:openldap /var/lib/ldap" 0
                execute_chroot "dnssec-signzone -K /etc/bind -o strongswan.org. /etc/bind/db.strongswan.org" 0
                execute_chroot "dnssec-signzone -K /etc/bind -o org. /etc/bind/db.org" 0
                execute_chroot "dnssec-signzone -K /etc/bind -o . /etc/bind/db.root" 0
-               execute_chroot "update-rc.d bind9 defaults" 0
+
+               for service in "apache2 slapd bind9"
+               do
+                       if [ "$BASEIMGSUITE" == "wheezy" ]
+                       then
+                               execute_chroot "update-rc.d $service defaults" 0
+                       else
+                               execute_chroot "systemctl enable $service" 0
+                       fi
+               done
        fi
        sync
        execute "umount -l $LOOPDIR" 0