ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

testing: Correctly dis-/enable services with systemd

This commit is contained in:
Tobias Brunner 2015-12-08 18:15:19 +01:00
parent f565f954a7
commit 654343d942
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testing/scripts/build-baseimage
View File

@ -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"

13
testing/scripts/build-guestimages
View File

@ -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