diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-11-25 11:46:10 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-11-25 11:46:10 -0800 |
| commit | 7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e (patch) | |
| tree | 0ebb51599a0024b2507811697bfe965e66ac29e1 /packages | |
| parent | 7d20f3843bff0069b1ac9b2f0c6d346889789058 (diff) | |
| parent | 1db41a6f5283d38dff6de0b0421d51eac869a39c (diff) | |
| download | vyos-cloud-init-7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e.tar.gz vyos-cloud-init-7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e.zip | |
Update with trunk and resolve conflicts
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/redhat/cloud-init.spec.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 49bd880b..81cccce5 100644 --- a/packages/redhat/cloud-init.spec.in +++ b/packages/redhat/cloud-init.spec.in @@ -99,6 +99,11 @@ rm -rf \$RPM_BUILD_ROOT%{python_sitelib}/tests mkdir -p \$RPM_BUILD_ROOT/%{_sharedstatedir}/cloud mkdir -p \$RPM_BUILD_ROOT/%{_libexecdir}/%{name} +#if $systemd +mkdir -p \$RPM_BUILD_ROOT/%{_unitdir} +cp -p systemd/* \$RPM_BUILD_ROOT/%{_unitdir} +#end if + %clean rm -rf \$RPM_BUILD_ROOT |