Merge ~andreserl/maas:1.9_lp1732703 into maas:1.9

[Andres Rodriguez]

LP: #1732703 - Correctly detect upstart when systemd is installed but not used.

[Mike Pontillo (mpontillo)]

Where are the unit tests for this change?

That said, this code should work. But I kind of liked Alberto's suggestion (can't remember where he posted it, maybe IRC):

    # readlink /proc/1/exe
    /lib/systemd/systemd

That is, we could check the running PID 1 itself to see if 'systemd' is in the name.

Either way, I think if MAAS is running in Docker, all bets are off. ;-)

review: Needs Information

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 1.9_lp1732703 lp:~andreserl/maas into -b 1.9 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/924/console
COMMIT: 3726c5425945c6f7f42f0bb369659c0201710716

review: Needs Fixing

[Mike Pontillo (mpontillo)]

Now that I fully understand the issue, I don't think this solves the problem. On a machine with systemd installed, you'll see the following:

$ ls -la /sbin/init
lrwxrwxrwx 1 root root 20 Oct 27 03:11 /sbin/init -> /lib/systemd/systemd

$ dpkg -S /sbin/init
systemd-sysv: /sbin/init

So the fact that /sbin/init is a link that points to the systemd binary means one of two things:

 - systemd is installed and is being used
 - systemd has been installed, but is not yet being used (the system has not rebooted)

So the most accurate way to determine which is running is indeed to look at PID 1 itself.

review: Needs Fixing

[Andres Rodriguez (andreserl)]

First, and foremost, this only applies to *Trusty*.

Trusty uses upstart by default. When you install systemd, /sbin/init will *NOT* point to /lib/systemd/systemd/.

You need to manually modify it to use /sbin/init, hence this patch works.

This has been already tested in multiple environments.

[Mike Pontillo (mpontillo)]

After discussing this on IRC, I agree that since we cannot support a Trusty system that is running MAAS 1.9 but has been dist-upgraded to Xenial, this fix should work fine for our use case.

review: Approve

[Mike Pontillo (mpontillo)]

That said, you're still missing unit tests. ;-) Please update them before landing.

[Blake Rouse (blake-rouse)]

This has been sitting for a long time, closing up the old queue.

Unmerged commits

3726c54... by Andres Rodriguez on 2017-12-07

LP: #1732703 - Correctly detect upstart when systemd is installed but not used.

diff --git a/src/provisioningserver/utils/__init__.py b/src/provisioningserver/utils/__init__.py
index 76ddab5..ff22503 100644
--- a/src/provisioningserver/utils/__init__.py
+++ b/src/provisioningserver/utils/__init__.py
@@ -502,12 +502,10 @@ def sudo(command_args):
         return ['sudo', '-n'] + command_args
 
 
-SYSTEMD_RUN_PATH = '/run/systemd/system'
-
-
 def get_init_system():
     """Returns 'upstart' or 'systemd'."""
-    if os.path.exists(SYSTEMD_RUN_PATH):
-        return 'systemd'
-    else:
-        return 'upstart'
+    init_path = '/sbin/init'
+    if os.path.islink(init_path):
+        if os.readlink(init_path) == "/lib/systemd/systemd":
+            return 'systemd'
+    return 'upstart'