diff options
author | Tobias Brunner <tobias@strongswan.org> | 2015-12-08 18:15:19 +0100 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2016-06-16 14:01:47 +0200 |
commit | 654343d94225211d3f5083ad7ffbc910739b3b5b (patch) | |
tree | 10a6ae7b6f4ac058ab66d282649fd63b9e15f098 /testing/scripts | |
parent | f565f954a76d395b378d2c82d75f8636a4978a5a (diff) | |
download | strongswan-654343d94225211d3f5083ad7ffbc910739b3b5b.tar.bz2 strongswan-654343d94225211d3f5083ad7ffbc910739b3b5b.tar.xz |
testing: Correctly dis-/enable services with systemd
Diffstat (limited to 'testing/scripts')
-rwxr-xr-x | testing/scripts/build-baseimage | 7 | ||||
-rwxr-xr-x | testing/scripts/build-guestimages | 13 |
2 files changed, 16 insertions, 4 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 3ad836bdd..2d923d596 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 8a44b4f76..e2ec422b1 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 |