use same folder structure in etc/systemd as used once installed

This commit is contained in:
j 2016-06-09 12:50:34 +02:00
parent d7a9ca28cb
commit cb6203ff82
7 changed files with 3 additions and 3 deletions

2
ctl
View file

@ -46,7 +46,7 @@ if [ "$action" = "install" ]; then
/lib/systemd/system/pandora-encoding.service \ /lib/systemd/system/pandora-encoding.service \
/lib/systemd/system/pandora-tasks.service \ /lib/systemd/system/pandora-tasks.service \
/lib/systemd/system/pandora-websocketd.service /lib/systemd/system/pandora-websocketd.service
cp $BASE/etc/systemd/*.service /etc/systemd/system/ cp $BASE/etc/systemd/system/*.service /etc/systemd/system/
cp $BASE/etc/tmpfiles.d/pandora.conf /etc/tmpfiles.d/ cp $BASE/etc/tmpfiles.d/pandora.conf /etc/tmpfiles.d/
systemd-tmpfiles --create /etc/tmpfiles.d/pandora.conf >/dev/null || true systemd-tmpfiles --create /etc/tmpfiles.d/pandora.conf >/dev/null || true
systemctl daemon-reload systemctl daemon-reload

View file

@ -74,7 +74,7 @@ def check_services(base):
if os.path.exists('/etc/init') and not os.path.exists('/bin/systemctl'): if os.path.exists('/etc/init') and not os.path.exists('/bin/systemctl'):
print('\tsudo cp %s/etc/init/%s.conf /etc/init/' % (base, service)) print('\tsudo cp %s/etc/init/%s.conf /etc/init/' % (base, service))
if os.path.exists('/bin/systemctl'): if os.path.exists('/bin/systemctl'):
print('\tsudo cp %s/etc/systemd/%s.service /lib/systemd/system/' % (base, service)) print('\tsudo cp %s/etc/systemd/system/%s.service /etc/systemd/system/' % (base, service))
print('\tsudo systemctl daemon-reload') print('\tsudo systemctl daemon-reload')
print('\tsudo service %s start' % service) print('\tsudo service %s start' % service)
print('') print('')
@ -84,7 +84,7 @@ def update_service(service):
if os.path.exists('/etc/init/%s.conf'%service): if os.path.exists('/etc/init/%s.conf'%service):
print('\tsudo cp %s/etc/init/%s.conf /etc/init/' % (base, service)) print('\tsudo cp %s/etc/init/%s.conf /etc/init/' % (base, service))
if os.path.exists('/bin/systemctl'): if os.path.exists('/bin/systemctl'):
print('\tsudo cp %s/etc/systemd/%s.service /lib/systemd/system/' % (base, service)) print('\tsudo cp %s/etc/systemd/system/%s.service /etc/systemd/system/' % (base, service))
print('\tsudo systemctl daemon-reload') print('\tsudo systemctl daemon-reload')
print('\tsudo service %s restart' % service) print('\tsudo service %s restart' % service)