Merge ~smoser/cloud-init:fix/rpm-build-systemd-fsck-dropin into cloud-init:master

[Scott Moser]

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

The change here fixes the build of CentOS 7 rpm.

The systemd 'drop-in' file systemd-fsck@.service.d/cloud-init.conf is
not expected to work on CentOS at the moment. There, the
cloud-init-local.service currently runs without DefaultDependencies=no.
That would likely cause a dependency loop.

The drop-in was added for bug 1691489. It may well be needed at a later
date in CentOS also.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:5310c7cd5662afa5e2fe040491e4c5201d696a6b
https://jenkins.ubuntu.com/server/job/cloud-init-ci/96/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: CentOS 6 & 7: Build & Test
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/96/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

spelling error in subject.
... to fix on pull
systemd

[Chad Smith (chad.smith)]

Looks simple/good. Builds working as you mentioned already https://jenkins.ubuntu.com/server/job/cloud-init-ci/96/console.

We can revisit this case in the future if CentOs exhibits /mnt timing issues across redeployments in Azure.

review: Approve

diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index 6ab0d20..d995b85 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -115,6 +115,12 @@ 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