[dracut] dracut-026-1
Harald Hoyer
harald at fedoraproject.org
Fri Mar 8 06:25:04 UTC 2013
commit f588f186dfe2fcf6b4cb4fc9111224184e756701
Author: Harald Hoyer <harald at redhat.com>
Date: Fri Mar 8 07:24:26 2013 +0100
dracut-026-1
- version 026
.gitignore | 1 +
0001-NEWS-update-for-version-025.patch | 35 ---------
0001-include-the-omap_hsmmc-module-on-arm.patch | 25 -------
...s-block-mount-root.sh-fixup-for-8b6bf0ef5.patch | 26 -------
...-of-tree-and-updated-drivers-in-initramfs.patch | 28 --------
...work-net-genrules.sh-remove-some-bashisms.patch | 42 -----------
0005-TODO-updated.patch | 33 ---------
...ed-mdmon-offroot-.service-to-mdmon-.servi.patch | 38 ----------
0007-shutdown-call-losetup-D-on-shutdown.patch | 35 ---------
0008-dracut.sh-reverting-return-value-change.patch | 38 ----------
...Mount-proc-before-including-dracut-lib.sh.patch | 41 -----------
0010-fix-CTC-example-in-rd.znet.patch | 23 ------
...rk-ifup.sh-enable-bridged-vlan-interfaces.patch | 73 --------------------
...ices-to-enable-booting-with-rd.live.overl.patch | 53 --------------
0013-set-peer-for-point-to-point-connections.patch | 49 -------------
...p.sh-echo-in-get_vid-instead-of-using-the.patch | 37 ----------
...url-lib-url-lib.sh-turn-off-curl-globbing.patch | 23 ------
...acut.sh-make-var-log-a-symlink-to-run-log.patch | 30 --------
...setup.sh-make-drm-module-only-install-on-.patch | 23 ------
...rfs.rules-remove-modprobe-of-btrfs-module.patch | 26 -------
..._finished.sh-use-btrfs-device-ready-for-p.patch | 21 ------
...modify-udev-rules-on-initramfs-creation-t.patch | 35 ---------
0021-virtfs-add-virtio_pci-kernel-module.patch | 22 ------
...cut-initqueue.sh-replace-UDEV_QUEUE_EMPTY.patch | 37 ----------
...gger-systemd-vconsole-setup.service-only-.patch | 50 -------------
...cut-pre-udev.service-load-service-on-dema.patch | 22 ------
...cut-pre-trigger.service-load-service-on-d.patch | 22 ------
...d-dracut-cmdline.sh-create-run-log-subdir.patch | 21 ------
...cut-pre-trigger.sh-enable-rd.break-pre-tr.patch | 23 ------
...-udev-debug-info-via-config-file-and-repo.patch | 39 -----------
...cut-pre-pivot.sh-remove-dev-root-symlink-.patch | 26 -------
...cut-initqueue-run-after-cryptsetup.target.patch | 21 ------
...cut-initqueue.sh-call-udevadm-settle-dire.patch | 22 ------
0032-url-lib-url-lib.sh-remove-bashisms.patch | 22 ------
...lib-url-lib.sh-add-proxy-support-for-curl.patch | 23 ------
0034-make-nbd-port-check-more-robust.patch | 26 -------
dracut.spec | 66 +++++++-----------
sources | 2 +-
38 files changed, 26 insertions(+), 1153 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48cd12e..4c455dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/dracut-022.tar.bz2
/dracut-023.tar.bz2
/dracut-025.tar.bz2
+/dracut-026.tar.bz2
diff --git a/dracut.spec b/dracut.spec
index 8b4c322..0661565 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -9,8 +9,8 @@
%endif
Name: dracut
-Version: 025
-Release: 35.git20130211%{?dist}
+Version: 026
+Release: 1%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -29,40 +29,6 @@ URL: https://dracut.wiki.kernel.org/
# Source can be generated by
# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
-Patch1: 0001-NEWS-update-for-version-025.patch
-Patch2: 0002-rootfs-block-mount-root.sh-fixup-for-8b6bf0ef5.patch
-Patch3: 0003-Support-out-of-tree-and-updated-drivers-in-initramfs.patch
-Patch4: 0004-network-net-genrules.sh-remove-some-bashisms.patch
-Patch5: 0005-TODO-updated.patch
-Patch6: 0006-mdmon-renamed-mdmon-offroot-.service-to-mdmon-.servi.patch
-Patch7: 0007-shutdown-call-losetup-D-on-shutdown.patch
-Patch8: 0008-dracut.sh-reverting-return-value-change.patch
-Patch9: 0009-Mount-proc-before-including-dracut-lib.sh.patch
-Patch10: 0010-fix-CTC-example-in-rd.znet.patch
-Patch11: 0011-network-ifup.sh-enable-bridged-vlan-interfaces.patch
-Patch12: 0012-Provide-devices-to-enable-booting-with-rd.live.overl.patch
-Patch13: 0013-set-peer-for-point-to-point-connections.patch
-Patch14: 0014-network-ifup.sh-echo-in-get_vid-instead-of-using-the.patch
-Patch15: 0015-url-lib-url-lib.sh-turn-off-curl-globbing.patch
-Patch16: 0016-dracut.sh-make-var-log-a-symlink-to-run-log.patch
-Patch17: 0017-drm-module-setup.sh-make-drm-module-only-install-on-.patch
-Patch18: 0018-btrfs-80-btrfs.rules-remove-modprobe-of-btrfs-module.patch
-Patch19: 0019-btrfs-btrfs_finished.sh-use-btrfs-device-ready-for-p.patch
-Patch20: 0020-udev-rules-modify-udev-rules-on-initramfs-creation-t.patch
-Patch21: 0021-virtfs-add-virtio_pci-kernel-module.patch
-Patch22: 0022-systemd-dracut-initqueue.sh-replace-UDEV_QUEUE_EMPTY.patch
-Patch23: 0023-systemd-trigger-systemd-vconsole-setup.service-only-.patch
-Patch24: 0024-systemd-dracut-pre-udev.service-load-service-on-dema.patch
-Patch25: 0025-systemd-dracut-pre-trigger.service-load-service-on-d.patch
-Patch26: 0026-systemd-dracut-cmdline.sh-create-run-log-subdir.patch
-Patch27: 0027-systemd-dracut-pre-trigger.sh-enable-rd.break-pre-tr.patch
-Patch28: 0028-systemd-set-udev-debug-info-via-config-file-and-repo.patch
-Patch29: 0029-systemd-dracut-pre-pivot.sh-remove-dev-root-symlink-.patch
-Patch30: 0030-systemd-dracut-initqueue-run-after-cryptsetup.target.patch
-Patch31: 0031-systemd-dracut-initqueue.sh-call-udevadm-settle-dire.patch
-Patch32: 0032-url-lib-url-lib.sh-remove-bashisms.patch
-Patch33: 0033-url-lib-url-lib.sh-add-proxy-support-for-curl.patch
-Patch34: 0034-make-nbd-port-check-more-robust.patch
BuildRequires: dash bash git
@@ -121,7 +87,7 @@ Requires: udev > 166
Requires: kbd kbd-misc
%if 0%{?fedora} || 0%{?rhel} > 6
Requires: util-linux >= 2.21
-Conflicts: systemd < 187
+Conflicts: systemd < 198
%else
Requires: util-linux-ng >= 2.21
%endif
@@ -231,6 +197,11 @@ rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
%endif
+%if %{defined _unitdir}
+# for systemd, better use systemd-bootchart
+rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart
+%endif
+
# we do not support dash in the initramfs
rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
@@ -252,12 +223,12 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
-install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/40-fips.conf
+install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
+install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/40-fips.conf
%endif
%if 0%{?suse_version}
-install -m 0644 dracut.conf.d/suse.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
+install -m 0644 dracut.conf.d/suse.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
%endif
%if 0%{?fedora} <= 12 && 0%{?rhel} < 6 && 0%{?suse_version} <= 9999
@@ -295,9 +266,10 @@ rm -rf $RPM_BUILD_ROOT
%{dracutlibdir}/dracut-install
%config(noreplace) /etc/dracut.conf
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%config /etc/dracut.conf.d/01-dist.conf
+%{dracutlibdir}/dracut.conf.d/01-dist.conf
%endif
%dir /etc/dracut.conf.d
+%dir %{dracutlibdir}/dracut.conf.d
%{_mandir}/man8/dracut.8*
%{_mandir}/man8/*service.8*
%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
@@ -307,7 +279,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man7/dracut.kernel.7*
%{_mandir}/man7/dracut.cmdline.7*
%{_mandir}/man5/dracut.conf.5*
+%if %{defined _unitdir}
+%{dracutlibdir}/modules.d/00systemd-bootchart
+%else
%{dracutlibdir}/modules.d/00bootchart
+%endif
%{dracutlibdir}/modules.d/04watchdog
%{dracutlibdir}/modules.d/05busybox
%{dracutlibdir}/modules.d/10i18n
@@ -361,6 +337,9 @@ rm -rf $RPM_BUILD_ROOT
%{_unitdir}/dracut-shutdown.service
%{_unitdir}/shutdown.target.wants/dracut-shutdown.service
%endif
+%if 0%{?fedora} || 0%{?rhel} > 6
+%{_prefix}/lib/kernel/install.d/50-dracut.install
+%endif
%files network
%defattr(-,root,root,0755)
@@ -380,7 +359,7 @@ rm -rf $RPM_BUILD_ROOT
%files fips
%defattr(-,root,root,0755)
%{dracutlibdir}/modules.d/01fips
-%config(noreplace) /etc/dracut.conf.d/40-fips.conf
+%{dracutlibdir}/dracut.conf.d/40-fips.conf
%endif
%files fips-aesni
@@ -401,6 +380,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Fri Mar 08 2013 Harald Hoyer <harald at redhat.com> 026-1
+- version 026
+
* Mon Feb 11 2013 Harald Hoyer <harald at redhat.com> 025-35.git20130211
- update to recent git
diff --git a/sources b/sources
index 8a92e1a..e1ef155 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f58ba6d44bafebd1209d86d158be1bc1 dracut-025.tar.bz2
+53d51a32567915836d855e1762ce51d8 dracut-026.tar.bz2
More information about the scm-commits
mailing list