← Back to team overview

cloud-init-dev team mailing list archive

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


Scott Moser has proposed merging ~smoser/cloud-init:fix/rpm-build-systemd-fsck-dropin into cloud-init:master.

Commit message:
centos: do not package systed-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.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:fix/rpm-build-systemd-fsck-dropin into cloud-init:master.
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

Follow ups