From 6195cc16999c67434c84156c5466afc8c36ed693 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 26 Mar 2013 16:59:19 +0100 Subject: [PATCH] dracut-027 --- .gitignore | 1 + dracut.spec | 99 ++++++++++++++--------------------------------------- sources | 2 +- 3 files changed, 27 insertions(+), 75 deletions(-) diff --git a/.gitignore b/.gitignore index 4c455dc..b89cced 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /dracut-023.tar.bz2 /dracut-025.tar.bz2 /dracut-026.tar.bz2 +/dracut-027.tar.bz2 diff --git a/dracut.spec b/dracut.spec index da5f283..ea4317e 100644 --- a/dracut.spec +++ b/dracut.spec @@ -9,8 +9,8 @@ %endif Name: dracut -Version: 026 -Release: 72.git20130320%{?dist} +Version: 027 +Release: 1%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -29,86 +29,19 @@ 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-systemd-module-setup.sh-call-systemd-in-private-dir-.patch -Patch2: 0002-add-lib-kernel-install.d-51-dracut-rescue.install.patch -Patch3: 0003-fedora.conf.example-make-hostonly-default-for-fedora.patch -Patch4: 0004-dracut.sh-remove-default-marker-in-help.patch -Patch5: 0005-dracut.sh-add-new-default-path-to-initramfs-accordin.patch -Patch6: 0006-add-rescue-dracut-module.patch -Patch7: 0007-dracut.sh-move-cleanup-trap-just-after-mktemp.patch -Patch8: 0008-dracut.spec-add-rescue-module.patch -Patch9: 0009-51-dracut-rescue.install-do-not-unset-installonly-on.patch -Patch10: 0010-lsinitrd.sh-fix-for-default-initrd-not-found-but-ima.patch -Patch11: 0011-lsinitrd.sh-removed-trailing.patch -Patch12: 0012-make-host_fs_types-a-hashmap.patch -Patch13: 0013-dracut.sh-add-swap-partitions-to-host-only-setup.patch -Patch14: 0014-add-51-dracut-rescue-postinst.sh.patch -Patch15: 0015-dracut.spec-add-nohostonly-and-norescue-subpackages.patch -Patch16: 0016-lsinitrd.sh-simplify-check-for-boot-loader-spec-dirs.patch -Patch17: 0017-51-dracut-rescue.install-create-directory-if-it-does.patch -Patch18: 0018-systemd-local-fs.target-is-now-root-fs.target-and-in.patch -Patch19: 0019-systemd-add-modules-load.d-modules-to-the-initramfs.patch -Patch20: 0020-systemd-add-sysctl.d-and-sysctl.conf.patch -Patch21: 0021-plymouth-do-not-install-hooks-in-systemd-mode.patch -Patch22: 0022-dracut.sh-add-regenerate-all.patch -Patch23: 0023-add-dracut-bash-completion.sh.patch -Patch24: 0024-dracut.spec-fix-requirements.patch -Patch25: 0025-dracut-initramfs-restore.sh-also-look-for-image-in-b.patch -Patch26: 0026-print-memdebug-to-stderr.patch -Patch27: 0027-Improve-documentation-of-rd.memdebug.patch -Patch28: 0028-Add-memdebug-at-different-points-in-99base-init.sh.patch -Patch29: 0029-systemd-remove-upstream-renamed-old-service-files.patch -Patch30: 0030-kernel-modules-move-usb-storage-out-of-fixed-drivers.patch -Patch31: 0031-dracut.sh-Add-noimageifnotneeded-parameter.patch -Patch32: 0032-shutdown-shutdown.sh-mount-move-all-basic-mounts-out.patch -Patch33: 0033-Don-t-write-DHCPV6C-yes-for-each-dhcp-ipv4-configura.patch -Patch34: 0034-Write-BOOTPROTO-ibft-for-ip-ibft-to-ifcfg-files.patch -Patch35: 0035-TODO-remove-completed-items.patch -Patch36: 0036-51-dracut-rescue-postinst.sh-fixed-new-kernel-pkg-ca.patch -Patch37: 0037-dracut-install-handle-more-ldd-errors.patch -Patch38: 0038-dracut.spec-fix-requirements.patch -Patch39: 0039-ifcfg-write-ifcfg.sh-fixed-typo.patch -Patch40: 0040-iscsi-iscsiroot.sh-do-not-mount-manually-in-systemd-.patch -Patch41: 0041-nfs-nfsroot.sh-only-cat-etc-fstab-if-existant.patch -Patch42: 0042-udev-rules-module-setup.sh-do-not-install-run.patch -Patch43: 0043-systemd-switch-to-new-initrd.target.patch -Patch44: 0044-systemd-do-not-use-systemd-version-until-fixed.patch -Patch45: 0045-fix-typo-in-dracut.conf.5.asc.patch -Patch46: 0046-fixed-testsuite.patch -Patch47: 0047-dracut.spec-bump-systemd-version-requirement.patch -Patch48: 0048-sosreport.sh-use-o-short-monotonic-for-the-journal-o.patch -Patch49: 0049-dracut-bash-completion.sh-add-kver-kernel-version-co.patch -Patch50: 0050-TEST-16-DMSQUASH-use-current-releasever.patch -Patch51: 0051-dracut.conf.5.asc-remove-duplicated-install_items.patch -Patch52: 0052-dmsquash-live-force-load-squashfs-kernel-module.patch -Patch53: 0053-sosreport-mkdir-run-initramfs-if-it-does-not-exist-y.patch -Patch54: 0054-kernel-modules-module-setup.sh-install-all-host-file.patch -Patch55: 0055-kernel-modules-module-setup.sh-don-t-fail-hard-on-a-.patch -Patch56: 0056-Makefile-use-D_FILE_OFFSET_BITS-64-to-build-dracut-i.patch -Patch57: 0057-drm-module-setup.sh-redirect-grep-to-dev-null.patch -Patch58: 0058-systemd-add-more-ordering.patch -Patch59: 0059-add-dracut.bootup.7-man-page.patch -Patch60: 0060-fs-lib-fs-lib.sh-write_fs_tab-start-initrd-root-fs.t.patch -Patch61: 0061-nbd-nbdroot.sh-fix-root-blockdev-case.patch -Patch62: 0062-network-netroot.sh-do-not-unset-root.patch -Patch63: 0063-TEST-40-NBD-test.sh-kill_server-after-test_run.patch -Patch64: 0064-51-dracut-rescue-postinst.sh-add-extra-checks.patch -Patch65: 0065-51-dracut-rescue-postinst.sh-Rename-image-and-grub-e.patch -Patch66: 0066-51-dracut-rescue-postinst.sh-51-dracut-rescue.instal.patch -Patch67: 0067-dracut.sh-remove-temporary-cpio-output-in-trap.patch -Patch68: 0068-dracut.spec-use-pkg-config-for-bashcompletiondir.patch -Patch69: 0069-dracut.spec-use-configure.patch -Patch70: 0070-dracut.sh-turn-off-host-only-mode-if-essential-syste.patch -Patch71: 0071-dracut.sh-turn-off-hostonly-mode-if-udev-database-is.patch BuildRequires: dash bash git %if 0%{?fedora} || 0%{?rhel} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: pkgconfig +%endif +%if 0%{?fedora} BuildRequires: bash-completion BuildRequires: pkgconfig %endif + %if 0%{?suse_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif @@ -160,7 +93,7 @@ Requires: kbd kbd-misc %if 0%{?fedora} || 0%{?rhel} > 6 Requires: util-linux >= 2.21 -Requires: systemd >= 198-5 +Requires: systemd >= 199 Conflicts: grubby < 8.23 %else Requires: udev > 166 @@ -436,6 +369,21 @@ rm -rf $RPM_BUILD_ROOT %if %{defined _unitdir} %{_unitdir}/dracut-shutdown.service %{_unitdir}/shutdown.target.wants/dracut-shutdown.service +%{_unitdir}/dracut-cmdline.service +%{_unitdir}/dracut-initqueue.service +%{_unitdir}/dracut-mount.service +%{_unitdir}/dracut-pre-mount.service +%{_unitdir}/dracut-pre-pivot.service +%{_unitdir}/dracut-pre-trigger.service +%{_unitdir}/dracut-pre-udev.service +%{_unitdir}/initrd.target.wants/dracut-cmdline.service +%{_unitdir}/initrd.target.wants/dracut-initqueue.service +%{_unitdir}/initrd.target.wants/dracut-mount.service +%{_unitdir}/initrd.target.wants/dracut-pre-mount.service +%{_unitdir}/initrd.target.wants/dracut-pre-pivot.service +%{_unitdir}/initrd.target.wants/dracut-pre-trigger.service +%{_unitdir}/initrd.target.wants/dracut-pre-udev.service + %endif %if 0%{?fedora} || 0%{?rhel} > 6 %{_prefix}/lib/kernel/install.d/50-dracut.install @@ -490,6 +438,9 @@ rm -rf $RPM_BUILD_ROOT %{dracutlibdir}/dracut.conf.d/02-norescue.conf %changelog +* Tue Mar 26 2013 Harald Hoyer 027-1 +- version 027 + * Wed Mar 20 2013 Harald Hoyer 026-72.git20130320 - fix rescue image naming Resolves: rhbz#923439 diff --git a/sources b/sources index e1ef155..8c9a346 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53d51a32567915836d855e1762ce51d8 dracut-026.tar.bz2 +a45b7a3a7bab16d3b6d4fbe782b3adcf dracut-027.tar.bz2