From ce6af2501358b848929ac14b577e801c7edfefbf Mon Sep 17 00:00:00 2001 From: Stanislav Sinyagin Date: Mon, 25 Apr 2016 17:29:35 +0200 Subject: [PATCH] FS-9075 fixup for systemd and sysvinit --- debian/bootstrap.sh | 15 +++++---------- debian/rules | 8 ++++++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 2106bd44fb..51a844deb6 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -1286,16 +1286,11 @@ map_modules "mod_filter" \ "gencontrol_per_cat" \ "gencontrol_per_mod geninstall_per_mod genoverrides_per_mod" -##### Not sure if this is needed at all... if this is supposed to be included somewhere it should be for just the freeswitch package -#if [ ${use_sysvinit} = "true" ]; then -# cp -a freeswitch-sysvinit.freeswitch.init freeswitch-all.freeswitch.init -# cp -a freeswitch-sysvinit.freeswitch.default freeswitch-all.freeswitch.default -# echo -n freeswitch-sysvinit >freeswitch-init.provided_by -#else -# cp -a freeswitch-systemd.freeswitch.service freeswitch-all.freeswitch.service -# cp -a freeswitch-systemd.freeswitch.tmpfile freeswitch-all.freeswitch.tmpfile -# echo -n freeswitch-systemd >freeswitch-init.provided_by -#fi +if [ ${use_sysvinit} = "true" ]; then + echo -n freeswitch-sysvinit >freeswitch-init.provided_by +else + echo -n freeswitch-systemd >freeswitch-init.provided_by +fi echo "Generating additional lintian overrides..." >&2 diff --git a/debian/rules b/debian/rules index 50a3c495a0..872b1724e1 100755 --- a/debian/rules +++ b/debian/rules @@ -100,6 +100,14 @@ override_dh_auto_install: dh_auto_install -- -C libs/esl pymod-install rm -f debian/tmp/usr/share/freeswitch/grammar/model/communicator/COPYING +override_dh_installinit: + if [ `cat debian/freeswitch-init.provided_by` = freeswitch-systemd ]; then \ + dh_systemd_enable -pfreeswitch-systemd --name=freeswitch; \ + dh_systemd_start -pfreeswitch-systemd --name=freeswitch; \ + else \ + dh_installinit -pfreeswitch-sysvinit --name=freeswitch; \ + fi + debian-bootstrap: debian/.stamp-bootstrap debian/.stamp-bootstrap: (cd debian && ./bootstrap.sh)