From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 8 Dec 2015 17:15:19 +0000 (+0100)
Subject: testing: Correctly dis-/enable services with systemd
X-Git-Tag: 5.5.0dr1~17^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=654343d94225211d3f5083ad7ffbc910739b3b5b;p=thirdparty%2Fstrongswan.git

testing: Correctly dis-/enable services with systemd
---

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 3ad836bdd2..2d923d596f 100755
--- 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 8a44b4f76e..e2ec422b11 100755
--- 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