From 9aa6c930a5433c99b0a1cb5bdd84559909b0ec83 Mon Sep 17 00:00:00 2001 From: Erez Zarum Date: Tue, 27 Dec 2016 02:51:10 +0200 Subject: [PATCH] duplicate init files on rhel7 and rhel6 - systemd >= rhel7 - init.d <= rhel6 - removed upstart. --- setup.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index c4ec20343..991cf80dc 100755 --- a/setup.py +++ b/setup.py @@ -64,16 +64,14 @@ def running_under_virtualenv(): data_files.append(('/etc/init', ['debian/diamond.upstart'])) if distro in ['centos', 'redhat', 'debian', 'fedora', 'oracle']: - data_files.append(('/etc/init.d', - ['bin/init.d/diamond'])) data_files.append(('/var/log/diamond', ['.keep'])) if distro_major_version >= 7 and not distro == 'debian': data_files.append(('/usr/lib/systemd/system', ['rpm/systemd/diamond.service'])) - elif distro_major_version >= 6 and not distro == 'debian': - data_files.append(('/etc/init', - ['rpm/upstart/diamond.conf'])) + elif distro_major_version <= 6 and not distro == 'debian': + data_files.append(('/etc/init.d', + ['bin/init.d/diamond'])) # Support packages being called differently on different distros