diff options
| author | Scott Moser <smoser@brickies.net> | 2017-07-26 10:51:20 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-07-26 11:43:59 -0400 |
| commit | 8a5296c41db45be3a172862f324ad44e732a2250 (patch) | |
| tree | 9eda252740d78b3258aa8bad73411a4bb0cc96d2 /packages/redhat | |
| parent | 1f5489c258a26f4e26261c40786537951d67df1e (diff) | |
| download | cloud-init-git-8a5296c41db45be3a172862f324ad44e732a2250.tar.gz | |
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.
Diffstat (limited to 'packages/redhat')
| -rw-r--r-- | packages/redhat/cloud-init.spec.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 6ab0d20b..d995b85f 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 |