From 7a7caeeb554940262df26703db5b543b77555db1 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Feb 10 2012 08:57:12 +0000 Subject: update to latest git --- diff --git a/dracut.spec b/dracut.spec index cee3d8c..ae0b88a 100644 --- a/dracut.spec +++ b/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 015 -Release: 7.git20120209%{?dist} +Release: 8.git20120210%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} > 6 @@ -30,10 +30,12 @@ Patch3: 0003-lsinitrd-silence-xz-test.patch Patch4: 0004-dracut-honor-binaries-in-sbin-first.patch Patch5: 0005-98usrmount-mount-usr.sh-remove-extra-slash.patch Patch6: 0006-99shutdown-shutdown-don-t-do-console_init-on-shutdow.patch +Patch7: 0007-Backup-and-restore-run-initramfs-via-systemd-service.patch BuildArch: noarch BuildRequires: dash bash git + %if 0%{?fedora} || 0%{?rhel} > 6 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif @@ -58,6 +60,10 @@ Obsoletes: nash <= 6.0.93 Obsoletes: libbdevid-python <= 6.0.93 %endif +%if 0%{?fedora} > 16 || 0%{?rhel} > 6 +BuildRequires: systemd-units +%endif + %if 0%{?suse_version} > 9999 Obsoletes: mkinitrd < 2.6.1 Provides: mkinitrd = 2.6.1 @@ -168,7 +174,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT \ libdir=%{_prefix}/lib \ bindir=%{_bindir} \ - sysconfdir=/etc mandir=%{_mandir} + sysconfdir=/etc mandir=%{_mandir} \ + systemdsystemunitdir=%{_unitdir} echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/10rpmversion/dracut-version @@ -224,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{dracutlibdir}/modules.d %{dracutlibdir}/dracut-functions %{dracutlibdir}/dracut-logger +%{dracutlibdir}/dracut-initramfs-backup %config(noreplace) /etc/dracut.conf %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} > 6 %config /etc/dracut.conf.d/01-dist.conf @@ -273,6 +281,10 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/logrotate.d/dracut_log %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %dir %{_sharedstatedir}/initramfs +%if 0%{?fedora} > 16 || 0%{?rhel} > 6 +%{_unitdir}/*.service +%{_unitdir}/*/*.service +%endif %files network %defattr(-,root,root,0755) @@ -313,6 +325,9 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Fri Feb 10 2012 Harald Hoyer 015-8.git20120210 +- update to latest git + * Thu Feb 09 2012 Harald Hoyer 015-7.git20120209 - update to latest git