fix plymouth race at bootup breaking efi/vesa handoff.

- fix version number - its against fedora package policy to have 0.year
This commit is contained in:
Dave Airlie 2012-08-21 09:16:05 +10:00
parent bb79161f30
commit 8ff5ec7dac
2 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up plymouth-0.8.6.2/systemd-units/plymouth-start.service.in.dma plymouth-0.8.6.2/systemd-units/plymouth-start.service.in
--- plymouth-0.8.6.2/systemd-units/plymouth-start.service.in.dma 2012-08-21 09:11:22.906284758 +1000
+++ plymouth-0.8.6.2/systemd-units/plymouth-start.service.in 2012-08-21 09:11:32.707345054 +1000
@@ -2,7 +2,7 @@
Description=Show Plymouth Boot Screen
DefaultDependencies=no
Wants=systemd-ask-password-plymouth.path
-After=systemd-vconsole-setup.service systemd-udev-settle.service
+After=systemd-vconsole-setup.service systemd-udev-trigger.service
Before=systemd-ask-password-plymouth.service
ConditionKernelCommandLine=!plymouth.enable=0
ConditionPathExists=!@plymouthruntimedir@/pid

View File

@ -6,7 +6,7 @@
Summary: Graphical Boot Animation and Logger Summary: Graphical Boot Animation and Logger
Name: plymouth Name: plymouth
Version: 0.8.6.2 Version: 0.8.6.2
Release: 0.2012.07.23%{?dist} Release: 1.2012.07.23%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@ -15,6 +15,8 @@ Source2: charge.plymouth
Source3: plymouth-set-default-plugin Source3: plymouth-set-default-plugin
Source4: plymouth-update-initrd Source4: plymouth-update-initrd
Patch0: plymouth-fix-udev-trigger.patch
URL: http://www.freedesktop.org/wiki/Software/Plymouth URL: http://www.freedesktop.org/wiki/Software/Plymouth
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -240,6 +242,7 @@ Plymouth. It features a small spinner on a dark background.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .trigger
# Change the default theme # Change the default theme
sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
@ -504,6 +507,10 @@ fi
%defattr(-, root, root) %defattr(-, root, root)
%changelog %changelog
* Tue Aug 21 2012 Dave Airlie <airlied@redhat.com> 0.8.6.2-1.2012.07.23
- fix plymouth race at bootup breaking efi/vesa handoff.
- fix version number - its against fedora package policy to have 0.year
* Mon Jul 23 2012 Ray Strode <rstrode@redhat.com> 0.8.6.2-0.2012.07.23 * Mon Jul 23 2012 Ray Strode <rstrode@redhat.com> 0.8.6.2-0.2012.07.23
- One more crack at #830482 (will probably need additional fixes tomorrow) - One more crack at #830482 (will probably need additional fixes tomorrow)