[plymouth/f14/master] Fix plymouth-update-initrd to work with dracut
Ray Strode
rstrode at fedoraproject.org
Thu Aug 26 15:33:15 UTC 2010
commit 4bc7354aec09fa1492cfe0be46cf693bf2af9d3d
Author: Ray Strode <rstrode at redhat.com>
Date: Thu Aug 26 11:32:38 2010 -0400
Fix plymouth-update-initrd to work with dracut
This got fixed in f13, but apparently never f14.
plymouth-update-initrd | 2 ++
plymouth.spec | 10 +++++++++-
2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/plymouth-update-initrd b/plymouth-update-initrd
new file mode 100755
index 0000000..c07b561
--- /dev/null
+++ b/plymouth-update-initrd
@@ -0,0 +1,2 @@
+#!/bin/bash
+/sbin/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --install $(uname -r)
diff --git a/plymouth.spec b/plymouth.spec
index fbbfe8d..a5da147 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -6,13 +6,14 @@
Summary: Graphical Boot Animation and Logger
Name: plymouth
Version: 0.8.4
-Release: 0.20100823.1%{?dist}
+Release: 0.20100823.2%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
Source1: boot-duration
Source2: charge.plymouth
Source3: plymouth-set-default-plugin
+Source4: plymouth-update-initrd
URL: http://freedesktop.org/software/plymouth/releases
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -283,6 +284,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
cp $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow/{box,bullet,entry,lock}.png $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
+# Override plymouth-update-initrd to work dracut or mkinitrd
+cp -f $RPM_SOURCE_DIR/plymouth-update-initrd $RPM_BUILD_ROOT%{_libexecdir}/plymouth/plymouth-update-initrd
+
# Drop glow, it's not very Fedora-y
rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
@@ -486,6 +490,10 @@ fi
%defattr(-, root, root)
%changelog
+* Thu Aug 26 2010 Ray Strode <rstrode at redhat.com> 0.8.4-0.20100823.2
+- Fix plymouth-update-initrd
+ It's regressed to the pre-dracut version. This commit fixes that.
+
* Mon Aug 23 2010 Ray Strode <rstrode at redhat.com> 0.8.4-0.20100823.1
- Update to newer pre-release snapshot of 0.8.4
- Generate separate initrd in /boot
More information about the scm-commits
mailing list