diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-02-12 12:14:49 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-02-12 12:14:49 -0500 |
| commit | dd1c392eeae8324e59d34d8d448e74cfda6d1712 (patch) | |
| tree | 7f0236e34eb0f1770219d6c636c81eaf318f02e8 /packages | |
| parent | 65da76341796a00b7bbdca514167b89f99d5a599 (diff) | |
| parent | 4d80411700ca70401cda401ee9bca799b9b8c55d (diff) | |
| download | vyos-cloud-init-dd1c392eeae8324e59d34d8d448e74cfda6d1712.tar.gz vyos-cloud-init-dd1c392eeae8324e59d34d8d448e74cfda6d1712.zip | |
merge from trunk
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/redhat/cloud-init.spec.in | 5 | ||||
| -rw-r--r-- | packages/suse/cloud-init.spec.in | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 9614e2f1..0e9862d8 100644 --- a/packages/redhat/cloud-init.spec.in +++ b/packages/redhat/cloud-init.spec.in @@ -34,7 +34,7 @@ Requires: e2fsprogs Requires: net-tools Requires: procps Requires: shadow-utils -Requires: sudo +Requires: sudo >= 1.7.2p2-3 # Install pypi 'dynamic' requirements #for $r in $requires @@ -169,7 +169,7 @@ fi /usr/lib/%{name}/write-ssh-key-fingerprints # Docs -%doc TODO LICENSE ChangeLog Requires +%doc TODO LICENSE ChangeLog requirements.txt %doc %{_defaultdocdir}/cloud-init/* # Configs @@ -180,6 +180,7 @@ fi %dir %{_sysconfdir}/cloud/templates %config(noreplace) %{_sysconfdir}/cloud/templates/* %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf +%config(noreplace) %{_sysconfdir}/sudoers.d/cloud-init # Python code is here... %{python_sitelib}/* diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in index c30a6fae..53e6ad13 100644 --- a/packages/suse/cloud-init.spec.in +++ b/packages/suse/cloud-init.spec.in @@ -107,7 +107,7 @@ rm -r %{buildroot}/%{python_sitelib}/tests # Move documentation mkdir -p %{buildroot}/%{_defaultdocdir} mv %{buildroot}/usr/share/doc/cloud-init %{buildroot}/%{_defaultdocdir} -for doc in TODO LICENSE ChangeLog Requires ; do +for doc in TODO LICENSE ChangeLog requirements.txt; do cp \${doc} %{buildroot}/%{_defaultdocdir}/cloud-init done |