[dracut] - version 009 prerelease

Thu Mar 17 13:45:46 UTC 2011

commit 1f95645686c442afea87c48f8305ba55315a71c5
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Mar 17 14:45:53 2011 +0100

    - version 009 prerelease

 .gitignore  |    1 +
 dracut.spec |   75 ++++++++++++++++++++++++++++++-----------------------------
 sources     |    2 +-
 3 files changed, 40 insertions(+), 38 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 906dd31..94a565d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ dracut-007.tar.bz2
 /dracut-008-325d491.tar.bz2
 /dracut-008-b2415f4.tar.bz2
 /dracut-008.tar.bz2
+/dracut-009-519d339.tar.bz2
diff --git a/dracut.spec b/dracut.spec
index 923abcc..9480521 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,3 +1,4 @@
+%define gittag 519d339
 # Variables must be defined
 %define with_nbd                1
 
@@ -6,9 +7,17 @@
 %define with_nbd 0
 %endif
 
+%if %{defined gittag}
+%define rdist .git%{gittag}%{?dist}
+%define dashgittag -%{gittag}
+%else
+%define rdist %{?dist}
+%endif
+
 Name: dracut
-Version: 008
-Release: 7%{?dist}
+Version: 009
+%define release_prefix 0.1%{?rdist}
+Release: %{release_prefix}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora}
@@ -18,9 +27,9 @@ Group: System Environment/Base
 Group: System/Base
 %endif
 License: GPLv2+ 
-URL: http://apps.sourceforge.net/trac/dracut/wiki
+URL: https://dracut.wiki.kernel.org/
 # Source can be generated by 
-# http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=snapshot;h=%{?dashgittag};sf=tgz
+# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{?gittag};sf=tgz
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
 BuildArch: noarch
 
@@ -82,22 +91,6 @@ Requires: plymouth >= 0.8.0-0.2009.29.09.19.1
 Requires: util-linux >= 2.16
 %endif
 
-Patch1: 0001-dracut-functions-write-to-HOME-dracut.log-instead-of.patch
-Patch2: 0002-dracut.8.xml-corrected-typo.patch
-Patch3: 0003-plymouth-touch-dev-.systemd-plymouth.patch
-Patch4: 0004-dracut-Don-t-suppress-the-modprobe-error-output.patch
-Patch5: 0005-dracut-functions-handle-shared-objects-in-find_binar.patch
-Patch6: 0006-dracut-functions-fixed-installing-libraries-which-li.patch
-Patch7: 0007-i18n-fixed-config-file-parsing-in-hostonly-mode.patch
-Patch8: 0008-i18n-default-to-vconsole.font.unicode-1.patch
-Patch9: 0009-selinux-turn-off-selinux-by-default.patch
-Patch10: 0010-lvm-use-sysinit-if-lvm-version-v2.02.65.patch
-Patch11: 0011-Makefile-do-not-dash-syntax-check-module-setup.sh.patch
-Patch12: 0012-init-set-cdrom-polling-in-kernel.patch
-Patch13: 0013-fix-c0a82e271e2730159f042ee7d7fc4aca2e08d28a.patch
-Patch14: 0014-vconsole.font.unicode-vconsole.unicode.patch
-Patch15: 0015-90lvm-lvm_scan.sh-fixed-lvm-version-parsing.patch
-Patch16: 0016-90lvm-lvm_scan.sh-removed-garbage-line.patch
 
 %description
 Dracut contains tools to create a bootable initramfs for 2.6 Linux kernels. 
@@ -152,6 +145,15 @@ This package requires everything which is needed to build an
 all purpose initramfs with dracut, which does an integrity check.
 %endif
 
+%package caps
+Summary: Dracut modules to build a dracut initramfs which drops capabilities
+Requires: %{name} = %{version}-%{release}
+Requires: libcap
+
+%description caps
+This package requires everything which is needed to build an
+all purpose initramfs with dracut, which drops capabilities.
+
 %package tools
 Summary: Dracut tools to build the local initramfs
 Requires: %{name} = %{version}-%{release}
@@ -161,22 +163,6 @@ This package contains tools to assemble the local initrd and host configuration.
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
 
 %build
 make WITH_SWITCH_ROOT=0%{?with_switch_root}
@@ -201,9 +187,11 @@ mkdir -p $RPM_BUILD_ROOT/boot/dracut
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
 touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
 
 %if 0%{?fedora}
 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
 %endif
 
 %if 0%{?suse_version}
@@ -215,6 +203,9 @@ rm $RPM_BUILD_ROOT/sbin/mkinitrd
 rm $RPM_BUILD_ROOT/sbin/lsinitrd
 %endif
 
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/dracut
+install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -232,11 +223,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/dracut
 %dir %{_datadir}/dracut/modules.d
 %{_datadir}/dracut/dracut-functions
+%{_datadir}/dracut/dracut-logger
 %config(noreplace) /etc/dracut.conf
 %if 0%{?fedora} || 0%{?suse_version}
 %config(noreplace) /etc/dracut.conf.d/01-dist.conf
 %endif
 %dir /etc/dracut.conf.d
+%config(noreplace) /etc/logrotate.d/dracut
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man5/dracut.conf.5*
@@ -265,7 +258,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95zfcp
 %{_datadir}/dracut/modules.d/95terminfo
 %{_datadir}/dracut/modules.d/95udev-rules
-%{_datadir}/dracut/modules.d/96insmodpost
 %{_datadir}/dracut/modules.d/97biosdevname
 %{_datadir}/dracut/modules.d/98selinux
 %{_datadir}/dracut/modules.d/98syslog
@@ -273,6 +265,7 @@ rm -rf $RPM_BUILD_ROOT
 # logfile needs no logrotate, because it gets overwritten
 # for every dracut run
 %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
+%dir %{_sharedstatedir}/initramfs
 
 %files network
 %defattr(-,root,root,0755)
@@ -288,8 +281,13 @@ rm -rf $RPM_BUILD_ROOT
 %files fips
 %defattr(-,root,root,0755)
 %{_datadir}/dracut/modules.d/01fips
+%config(noreplace) /etc/dracut.conf.d/40-fips.conf
 %endif
 
+%files caps
+%defattr(-,root,root,0755)
+%{_datadir}/dracut/modules.d/02caps
+
 %files tools 
 %defattr(-,root,root,0755)
 %{_mandir}/man8/dracut-gencmdline.8*
@@ -301,6 +299,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Mar 17 2011 Harald Hoyer <harald at redhat.com> 009-0.1
+- version 009 prerelease
+
 * Tue Feb 22 2011 Harald Hoyer <harald at redhat.com> 008-7
 - fixed lvm version parsing
 
diff --git a/sources b/sources
index 8cd3d40..99dce3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c2507d7b956e5b81aac6abd38c3595e3  dracut-008.tar.bz2
+aae6a2dd51ff90dbbc9083a49c7a8c73  dracut-009-519d339.tar.bz2
