Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/smoku/installer

firstboot/.gitignore

@@ -0,0 +1 @@
+*.py[co]

qubes-logos/plymouth/plymouthd.defaults

@@ -0,0 +1,4 @@
+# Distribution defaults. Changes to this file will get overwritten during
+# upgrades.
+[Daemon]
+Theme=script

qubes-logos/qubes-logos.spec

@@ -17,6 +17,7 @@ Conflicts: anaconda-images <= 10
 Conflicts: redhat-artwork <= 5.0.5
 # For _kde4_appsdir macro:
 BuildRequires: kde-filesystem
+Requires: plymouth-theme-script
 
 
 %description
@@ -49,22 +50,30 @@ done
 mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
 install -p -m 644 ksplash/SolarComet-kde.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge/
-for i in plymouth/charge/* ; do
-    install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge/
+for k in charge script; do
+    mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/$k/
+    for i in plymouth/$k/* ; do
+        install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/$k/
+    done
 done
+install -p -m 644 plymouth/plymouthd.defaults $RPM_BUILD_ROOT%{_datadir}/plymouth
 
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/usr/sbin/plymouth-set-default-theme script || :
+
 %files
 %defattr(-, root, root)
 %doc COPYING COPYING-kde-logo
 %{_datadir}/firstboot/themes/*
 %{_datadir}/anaconda/pixmaps/*
+%{_datadir}/plymouth/plymouthd.defaults
 %{_datadir}/plymouth/themes/charge/*
+%{_datadir}/plymouth/themes/script/*
 %{_datadir}/pixmaps/splash/*
 /usr/lib/anaconda-runtime/*.jpg
 %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png