[Pkg-ceph-commits] [ceph] 09/17: Restore missing debian folder from ceph_detect_init

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.

commit 636f172cf0908af0e87b7884dda1bbb27176d25b
Author: James Page <james.page at ubuntu.com>
Date:   Wed Mar 30 09:22:36 2016 +0100

    Restore missing debian folder from ceph_detect_init
---
 src/ceph-detect-init/ceph_detect_init/debian/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ceph-detect-init/ceph_detect_init/debian/__init__.py b/src/ceph-detect-init/ceph_detect_init/debian/__init__.py
index b5fc7c7..73a7851 100644
--- a/src/ceph-detect-init/ceph_detect_init/debian/__init__.py
+++ b/src/ceph-detect-init/ceph_detect_init/debian/__init__.py
@@ -14,4 +14,8 @@ def choose_init():
             return 'systemd'
         else:
             return 'upstart'
-    return 'sysvinit'
+    if distro.lower() == 'debian':
+        if codename in ('squeeze', 'wheezy'):
+            return 'sysvinit'
+        else:
+            return 'systemd'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git