diff --git a/cloud-init.changes b/cloud-init.changes index 3ec994b..12b9e23 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 26 11:31:34 UTC 2016 - rjschwei@suse.com + +- Fix package, udev rules should be in /usr for distros after + SLES 11 + ------------------------------------------------------------------- Wed Oct 19 13:23:35 UTC 2016 - dmueller@suse.com diff --git a/cloud-init.spec b/cloud-init.spec index f1c8411..d5f768c 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -223,8 +223,10 @@ sed -i s/INSERT_SUSE_DISTRO/opensuse/ %{buildroot}/%{_sysconfdir}/cloud/cloud.cf %endif %endif %if 0%{?suse_version} && 0%{?suse_version} > 1110 -mkdir %{buildroot}/%{_sysconfdir}/rsyslog.d +mkdir -p %{buildroot}/%{_sysconfdir}/rsyslog.d +mkdir -p %{buildroot}/usr/lib/udev/rules.d/ cp -a %{SOURCE2} %{buildroot}/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf +mv %{buildroot}/lib/udev/rules.d/66-azure-ephemeral.rules %{buildroot}/usr/lib/udev/rules.d/ %endif # remove debian/ubuntu specific profile.d file (bnc#779553) @@ -287,16 +289,19 @@ popd %if 0%{?suse_version} && 0%{?suse_version} > 1110 %dir %{_sysconfdir}/rsyslog.d %{_sysconfdir}/rsyslog.d/21-cloudinit.conf -%endif +/usr/lib/udev/rules.d/66-azure-ephemeral.rules +%else +%dir /lib/udev +%dir /lib/udev/rules.d /lib/udev/rules.d/66-azure-ephemeral.rules +%endif %dir %attr(0755, root, root) %{_localstatedir}/lib/cloud %dir %{docdir} %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d %dir /etc/dhcp %dir /etc/dhcp/dhclient-exit-hooks.d -%dir /lib/udev -%dir /lib/udev/rules.d + %files doc