testing: Correctly dis-/enable services with systemd
authorTobias Brunner <tobias@strongswan.org>
Tue, 8 Dec 2015 17:15:19 +0000 (18:15 +0100)
committerTobias Brunner <tobias@strongswan.org>
Thu, 16 Jun 2016 12:01:47 +0000 (14:01 +0200)
testing/scripts/build-baseimage
testing/scripts/build-guestimages

index 3ad836b..2d923d5 100755 (executable)
@@ -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"
index 8a44b4f..e2ec422 100755 (executable)
@@ -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