From 6a8456452495472d98d584e228f189b5dab2b58b Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Wed, 6 Apr 2011 13:35:54 +0200 Subject: [PATCH 1/5] Ignore *.py[co] files --- firstboot/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 firstboot/.gitignore diff --git a/firstboot/.gitignore b/firstboot/.gitignore new file mode 100644 index 0000000..539da74 --- /dev/null +++ b/firstboot/.gitignore @@ -0,0 +1 @@ +*.py[co] From 8e692ca4dcad9050f04b4f240999cb0769bd2ecd Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Wed, 6 Apr 2011 13:46:11 +0200 Subject: [PATCH 2/5] Use plymouth-theme-script by default. #187 --- qubes-logos/plymouth/plymouthd.defaults | 4 ++++ qubes-logos/qubes-logos.spec | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 qubes-logos/plymouth/plymouthd.defaults diff --git a/qubes-logos/plymouth/plymouthd.defaults b/qubes-logos/plymouth/plymouthd.defaults new file mode 100644 index 0000000..2138789 --- /dev/null +++ b/qubes-logos/plymouth/plymouthd.defaults @@ -0,0 +1,4 @@ +# Distribution defaults. Changes to this file will get overwritten during +# upgrades. +[Daemon] +Theme=script diff --git a/qubes-logos/qubes-logos.spec b/qubes-logos/qubes-logos.spec index 6c5c569..8608179 100644 --- a/qubes-logos/qubes-logos.spec +++ b/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 @@ -53,17 +54,22 @@ 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/ 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}/pixmaps/splash/* /usr/lib/anaconda-runtime/*.jpg From 1ee9add6682c381d5a7ff84e938a5818f06e4dec Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Wed, 6 Apr 2011 14:24:24 +0200 Subject: [PATCH 3/5] Workaround plymouth-set-default-theme always returning 1 --- qubes-logos/qubes-logos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubes-logos/qubes-logos.spec b/qubes-logos/qubes-logos.spec index 8608179..f5fb40b 100644 --- a/qubes-logos/qubes-logos.spec +++ b/qubes-logos/qubes-logos.spec @@ -62,7 +62,7 @@ install -p -m 644 plymouth/plymouthd.defaults $RPM_BUILD_ROOT%{_datadir}/plymout rm -rf $RPM_BUILD_ROOT %post -/usr/sbin/plymouth-set-default-theme script +/usr/sbin/plymouth-set-default-theme script || : %files %defattr(-, root, root) From 3c2a7e27230ab4f7fd484130f8868031a7e2fcc2 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Wed, 6 Apr 2011 14:26:25 +0200 Subject: [PATCH 4/5] Replace progress bar with prettier one --- qubes-logos/plymouth/script/progress_bar.png | Bin 0 -> 470 bytes qubes-logos/plymouth/script/progress_box.png | Bin 0 -> 314 bytes qubes-logos/qubes-logos.spec | 9 ++++++--- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 qubes-logos/plymouth/script/progress_bar.png create mode 100644 qubes-logos/plymouth/script/progress_box.png diff --git a/qubes-logos/plymouth/script/progress_bar.png b/qubes-logos/plymouth/script/progress_bar.png new file mode 100644 index 0000000000000000000000000000000000000000..143664ac9bea18aa617464a4a9a60126b3ce19a9 GIT binary patch literal 470 zcmV;{0V)28P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FTR01FTSts}j400007bV*G`2igV) z4krQ1y7vhH00CA>L_t(o!|hnhj>I4gi`)7CFW%O3;eZ%oOn2w7QY=;F5klgSP!-XE zWE2X8-vdBIL>xs$q3}Jt#>9(=vnAfq+GjVW-m`U%?8}fl4ZXcCwZ>VuveD7ya&|V} zXM5~`?YSc2ZqGIJf0DVeJzJa2Ut<0id#vVn*WMdC9r>Ow#pyNS;%>2+29aWni42o5 zbcq|2WX|@>bSimF+Hh|3q)p*B5}P3G%j}|Qr{f0_UODMIwyF4Yk?fhg6H^#|hKQSr z)yifSmod&9#y)I2jKjbOfzF(sIe-l!|LhalNLsZ&1y@QpjX8e7*V%z&(x<`KEY8>{ zURhy)VFMS%(2<9bhryp+_>aU9CINs!oLl9PB;4)+Q@wY% z*g5cgkQC~6#{-)wlE?YFfst4$E?g8L=Vtw|7xfphP^iC%g~GqY8}Ba8416W#KmY&$ M07*qoM6N<$f=X=BBLDyZ literal 0 HcmV?d00001 diff --git a/qubes-logos/plymouth/script/progress_box.png b/qubes-logos/plymouth/script/progress_box.png new file mode 100644 index 0000000000000000000000000000000000000000..f293fd3560f2706df5f97bc4f031e9d2ea89a1f7 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^H-MOfgAGW|mNPsAq!^2X+?^QKos)S9ukg8{TX&gWSQERhdhYjCkM_vx|J<(@_a)Li`&|DlpFCId@1>^ICyPs- zR~~sMr`96i#Gwc!=KqjUnJpLjs%LHQyAY|AzsA@~ literal 0 HcmV?d00001 diff --git a/qubes-logos/qubes-logos.spec b/qubes-logos/qubes-logos.spec index f5fb40b..068d691 100644 --- a/qubes-logos/qubes-logos.spec +++ b/qubes-logos/qubes-logos.spec @@ -50,9 +50,11 @@ 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 @@ -71,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT %{_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 From 0e1b616b85f118e116094f7028d141442e2af8bf Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Wed, 6 Apr 2011 14:37:36 +0200 Subject: [PATCH 5/5] Use non-shaded progress bar --- qubes-logos/plymouth/script/progress_bar.png | Bin 470 -> 180 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/qubes-logos/plymouth/script/progress_bar.png b/qubes-logos/plymouth/script/progress_bar.png index 143664ac9bea18aa617464a4a9a60126b3ce19a9..d36a84c14beff4b2e61b6e83c46738a73a95c914 100644 GIT binary patch delta 106 zcmcb{yoGUsIVS@M{B+)3KhZ%h>^2JA_Z!a@)GAIbJ9ISSh zx-==DQ?z9!2ls4-1N~Z_yQ)1I+n=wR<;=F@ctU~!1H-+Wk##H_JLf6#flT#u^>bP0 Hl+XkK`iUZc delta 398 zcmV;90dfAc0oDVMHwpg${{a7>y{D6rKpubE1_ur&0m{1f2><{AR!KxbR9M69Sj&#Y zAPkG!`TsB8)^p*27-CF!=de;NRpk*v;*d}k(Sc+X3WeVTKtx0wMMa_TJ-o)mi-@x& z-qG4;H>TdRb&l-IkUI^%y)L!JS+}y$(dBY>Hr{7@?11gLBI0h(HS~Xyxv@Q4o6Ub; zV*VC;tmb#u-Wxg{`JOMu={4cvZn2mKkz$OA43jZ*i5rt-&i2c6DtS!WaBlOYP2o2Z zn;`7V?4oI>;|CI6Iq5sLsrYk|?3uh1Qy6}Rh?|Pl%4QXpG0q&uK5RRT!@viD&YYe( zfDI!5>=W5YTD3m~S4uaHIex*{*@1dw(x<`KEY8>{URhy)VFMS%(2<9bhryp+_>aU9 zCINs!oLl9PB;4)+Q@wY%*g5cgkQC~6#{-)wlE?YFfst4$ sE?g8L=Vtw|7xfphP^iC%g~GqY8}Ba8416W#KmY&$07*qoM6N<$f*L@^KmY&$