Merge ~rbalint/cloud-init:fix-1717477 into cloud-init:master

[Balint Reczey]

Do not provide systemd-fsck drop-in which could cause ordering cycles.

Revert "centos: do not package systemd-fsck drop-in."
Revert "systemd: make systemd-fsck run after cloud-init.service"

The systemd-fsck drop-in caused regressions by introducing ordering
The change reverts the original commit that added systemd-fsck drop-in
and another commit that had removed that from the centos packaging:
    1f5489c258a26f4e26261c40786537951d67df1e
    8a5296c41db45be3a172862f324ad44e732a2250

The result is to no longer provide the systemd-fsck drop-in.

LP: #1717477

523da27... by Balint Reczey on 2017-09-15

Revert "centos: do not package systemd-fsck drop-in."

This reverts commit 8a5296c41db45be3a172862f324ad44e732a2250.

[Balint Reczey (rbalint)]

Needs testing

[Scott Moser (smoser)]

I built a package with this, and then installed it into an artful system.
the installation resulted in
 /lib/systemd/system/systemd-fsck@.service.d/cloud-init.conf
being removed, so that seems right to me.

I've re-written the commit message to a single commit that we can then
cherry pick for the SRU.

review: Approve

diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index d995b85..6ab0d20 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -115,12 +115,6 @@ rm -rf $RPM_BUILD_ROOT%{python_sitelib}/tests
 mkdir -p $RPM_BUILD_ROOT/%{_sharedstatedir}/cloud
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/%{name}
 
-# LP: #1691489: Remove systemd-fsck dropin (currently not expected to work)
-%if "%{init_system}" == "systemd"
-rm $RPM_BUILD_ROOT/usr/lib/systemd/system/systemd-fsck@.service.d/cloud-init.conf
-%endif
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/setup.py b/setup.py
index 7662bd8..9199317 100755
--- a/setup.py
+++ b/setup.py
@@ -125,7 +125,6 @@ INITSYS_FILES = {
                 for f in (glob('systemd/*.tmpl') +
                           glob('systemd/*.service') +
                           glob('systemd/*.target')) if is_f(f)],
-    'systemd.fsck-dropin': ['systemd/systemd-fsck@.service.d/cloud-init.conf'],
     'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
     'upstart': [f for f in glob('upstart/*') if is_f(f)],
 }
@@ -135,9 +134,6 @@ INITSYS_ROOTS = {
     'sysvinit_deb': 'etc/init.d',
     'sysvinit_openrc': 'etc/init.d',
     'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
-    'systemd.fsck-dropin': (
-        os.path.sep.join([pkg_config_read('systemd', 'systemdsystemunitdir'),
-                          'systemd-fsck@.service.d'])),
     'systemd.generators': pkg_config_read('systemd',
                                           'systemdsystemgeneratordir'),
     'upstart': 'etc/init/',
diff --git a/systemd/systemd-fsck@.service.d/cloud-init.conf b/systemd/systemd-fsck@.service.d/cloud-init.conf
deleted file mode 100644
index 0bfa465..0000000
--- a/systemd/systemd-fsck@.service.d/cloud-init.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-After=cloud-init.service