From bee97a75704b632280a4dd9a9ba129ebeabbd270 Mon Sep 17 00:00:00 2001 Message-Id: From: Philipp Hahn Date: Mon, 22 Sep 2014 11:44:07 +0200 Subject: [PATCH] Bug #35935 bootsplash: fix screen location Organization: Univention GmbH, Bremen, Germany Fix screen location of messages. Remove old logo file. Fix shell quoting error debian/*: remove no longer required files and code Fix copy-paste errors from plymouth example theme. --- .../univention-bootsplash/conffiles/bootsplash.py | 11 +++-- .../base/univention-bootsplash/debian/changelog | 12 +++++- .../debian/univention-bootsplash.dirs | 2 - .../debian/univention-bootsplash.postinst | 29 ++----------- .../base/univention-bootsplash/ucs/logo.png | Bin 19449 -> 0 bytes .../base/univention-bootsplash/ucs/ucs.plymouth | 7 +--- .../base/univention-bootsplash/ucs/ucs.script | 45 ++++++++++----------- 7 files changed, 44 insertions(+), 62 deletions(-) delete mode 100644 branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.dirs delete mode 100644 branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/logo.png diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/conffiles/bootsplash.py b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/conffiles/bootsplash.py index ffc9692..c84ca6e 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/conffiles/bootsplash.py +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/conffiles/bootsplash.py @@ -1,9 +1,12 @@ -import os +from subprocess import call + def postinst(baseConfig, changes): theme = changes.get("bootsplash/theme", False) - if theme and type(()) == type(theme): + try: old, new = theme + except (TypeError, ValueError): + pass + else: if new: - os.system("plymouth-set-default-theme %s" % new) - os.system("update-initramfs -u") + call(("plymouth-set-default-theme", "--rebuild-initrd", new)) diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/changelog b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/changelog index 9bca5a1..2255248 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/changelog +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/changelog @@ -1,3 +1,13 @@ +univention-bootsplash (6.0.1-2) unstable; urgency=low + + * Bug #35935: + - remove old logo + - fix screen location of text + * Fix shell quoting error + * debian/*: remove no longer required files and code + + -- Philipp Hahn Mon, 22 Sep 2014 11:34:18 +0200 + univention-bootsplash (6.0.1-1) unstable; urgency=low * new bootsplash layout (Bug #35935) @@ -313,5 +323,3 @@ univention-bootsplash (0.1) unstable; urgency=low * initial release -- Felix Meier Fri, 3 Dec 2004 17:02:27 +0100 - - diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.dirs b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.dirs deleted file mode 100644 index 1bbe7f1..0000000 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/plymouth/themes/ucs -etc diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.postinst b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.postinst index 5525f25..91b92f0 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.postinst +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/debian/univention-bootsplash.postinst @@ -32,38 +32,15 @@ eval "$(univention-config-registry shell)" -# update to ucs 3.0 with plymouth, can be removed after 3.0-0 -if [ "$1" = configure -a -n "$2" ] && dpkg --compare-versions "$2" lt 4.0.0-1; then - univention-config-registry set bootsplash/theme="ucs" - - splash=false - if echo $grub_append | grep -iq '\'; then - splash=true - fi - if echo $grub_append | grep -iq '\'; then - splash=true - fi - if echo $grub_append | grep -iq '\'; then - splash=false - fi - # remove splash stuff from grub/append - new=$(echo $grub_append | sed 's|\||g;s|\||g;s|\||g') - univention-config-registry set grub/append="$new" - if [ "true" = "$splash" ]; then - univention-config-registry set grub/bootsplash=splash - else - univention-config-registry set grub/bootsplash=nosplash - fi -fi - - univention-config-registry set \ bootsplash/theme?"ucs" \ grub/bootsplash?splash #DEBHELPER# -update-initramfs -u +if [ -x /usr/sbin/update-initramfs ]; then + update-initramfs -u +fi if [ -x /usr/bin/update-grub ]; then update-grub diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/logo.png b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/logo.png deleted file mode 100644 index 71788e3d48b17031fd48eb4db407b7ce48cce8cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19449 zcmXt=1yCDp*M=8&D{jTzA-ERT;>F#qw79#wyE_zjhvM$8#jUs%|MPw`|712h*-18= zC(oX9pL1Wk;YwenP!I_a0RTXekrr10uM_`U;9T2a=Nh&3yprqlCiVFawfQIa=C=h}k z5Sw|v+9d@IK#-wB#D%dz0zdY1SwxQ+k787SI9O;uKmtMp!f)j-Zv*x}Xo6=-KdZ;; zO=Qs#WZ-L1ZxlKXhNyWEI%yPOf{aHdf`{f0M+Oa#P6`cBOlO;ZjK7nLjQr`E?_mJY z#Q3_`@|o1Wg^PigOnzZ*T5znjnW^RP;O4XRBq_<;jT3z+XQ>BWM<+aXgjgK#1c zr#*9#^b1FR=Rqm@dkG!()eoKcZbMPj@0br=6e|Jd8wmhyK9z;v0bLTy=;sm+l%bQ+ zio^5LMg;tghK(rk``j5zhe#`b;E#ajZbZ zIBG_TfAvWorr^s4X)CP%q6WXW$2Jw~+X2J?kjEaB$9Uvz83K_}(!d=7X?^8N4_EM| zMjXY1G7HJ>pOYmN=+(=yC${rjP}G(54+42!k&|}RcJLn0@=%1TQMRT9g^rt^(M1fL z6%@dG)e~QDax8@++y4TOtAYgs5`z+(7nw(9m4Bd_oDtg!E3nFQAVWEVutdI!T81Yp zgtRNN81uKGi~}h^Da?PFZz3~12`U2ekN~g6#l>E953uJ~?rD6ruP^4E7e$#u`&@BE| zW1{$OfD*QZQHT+qp(c)I2t zpH+FI1_S=ELw*zlfHu?`Q9v7Fq-nTXiMy+bikE_aBM(wQgPKu`buD}h4>=QfBx;M( zXAp+2u*Q+Es0b*r&atTeDK4vtH6ECpd104T>WL zh!|_ir1c=@wZb@o1yw9Fb1fXr6qqmQetYhJc)pKd9*C|6e^yoOv-vmJT_ae6u?PUH z!%e$8EKAhTJax*dFV5%4&ezvN zlEKNz$-M|&8?H4uT9AoaGE2-N5C81FCAta#Ag3+DxyB(CX8XklBaJ@V9vL2;X|$K4 zy|RkkKA@t}e7jbTW%T9eauNwcfaIfckOCZJ5gM6OZELIM(}2HKoZ+&uyt`%!M9$F{ zbm%|s5Ii|hF=h?V=n{HPH$Ag2;{AtH7QXCDx40R?*_^K@&>+For}8{xf7$W!Q@F^8 z$aivm#E)QcDGpIf7zK{cU$A;j+5J~-Are=SB@;2AzW^a-ALJsZGHxh39o$}Tw!{Ba zyE&)1g&U6xe9j!n86-uN7xF0kvcJmn;85tY| zT7n3AZQ0TMrLhKVH3{YKKRyx6A~D5QCN@RA=nkKsZF_A?+(`2KoY=Mz_RsjSJ&*>a+&w-DO29ynhISeuWQ-lNA zFoK;T=o@(NxcZf6QU;Xv13>Smh=R$0-ayhYQUY;wHzCiPqbqUYt*58U$=Yep$E7v< zznyV=UYjqOoV@sk0!u_&zEFUCn;NN20xy}wk&LxRwB$lM5JoMcLNM#2KqmWn)Z}*Y zePjQgl-B~Jmn+Q5I|2;*Wcd%h`KaHQS{7Rt&FU@c$eXk5T-EFumh%cTr9dSyW=jM%O7hyT8ac zI}S?*1ps`rcrpqd;zKJ?fT@~L^6)R#p*&+`S_ZEr7)XeQ`4fSE8b~FZ9WI#|0aVES z>;a^HzexiuSxpfr`XME9GYv_u?5}?$0ayjS1KKb^tBd1N!}9k_cW0Y6tD%zetizGz zq#+x)*GtX`7bbp#%b&tPuN`%MN%xBI zR^m-I;@DHk_XiR0cpkMC0Y(mHJZAZZmS(hg#_!g>N%zuj=+Z-sqg(_Hl>CbP1ZcBU zmR3+w(LQf@6OfTl_?IvGUjGJDKDvGCi}=$n%5(p=!Ojcb<1^W%A>%7D$haz2o*Ss^ zX$j@*IT!GP^!A1eWypd6)m3tl3?sjMt2|2rR!Q?9Lm3{>yY372`N-fhAD* z8z`WKEPSOhPf$P)W^4x7w{yD%|Yp$rw{i)(3^ z{JY*8k&4UTVo*BtUbBau?qfNf z*!cA8wFh#>nV9&-Lqdn0%>*$RFGl7-ix+0R)gJ!wmsmK{D4qmwmM`#<)OCSwJzzYaH~ z<}!fnPCTw32-Y_&Xl{fc?d}ety5s#q>wa3vDILj&+~@0$p` z9)yyZJ=FBdyU2rIt+(uoQpYw~hs>_sykr3hMSm&d`V-;FD@ZihK!_kBseR_Boa>n+ozcD2eJ* zc;2k#U3O~s&u(?7mxqgNIc2AGT5}kgJyNNRikXLg;+D4}5yspfYs~D2TjXMkxiK)V zK7y$zDrw)JZvMjcpa5(CMVc~@VbrKmfBEswbJ8cr(#0UpFFR{TE_a&D-P=60krlC&VTi{-Gjb)vN%52M*qpZA*wDXylEcmIvsBgi>HXJMcIffaig0N%7+$P)2Fx2}GlgQBnIx~F}YNkgj0 zKY_TbX6>&R2B`g;Sp3dk4&L+YLVIqW)bA30*c|pY84))8m0JS#`LtvM3=zij64&zZ z`E8&{R>bNOyRu8*HGpfB{oxYJ^sI0?Zik5 z0qE*DUwTTedB|OKr#ox+r*mM|Y?;1nq#XN`$C@>tJI?peBoo-ET>i`Pf9%K&P2%Ij zJ`E$DXRK_f5%4mKMz@NUyY#SY$!sm^l1GAwvF*6YJxq}}4Av+q}+(Wr3b(BE2d{YX{W4XN{Ul2|>TR!b*XB6s3b z=<^fAGWU>-Ssz%T_qt9*jV|*;KQ!mp2y0pP;r|LBZ(!{Wozd?ZN=yOAAyCk0D?iO4N&6>Xy|uu=(-aNSdAA5R4trwaMWO9hW)uZZ|ZrwRlst zC}flRoQRm?4xkXp21tWW!9Rv|$Qh)-K{N~{+?r!Yp4gnoCXp)5y2(F1uqF|zbO#DP zMg~O6%Uy;8`fT1C%il(SJwEnyH1{fz9lBx5A;iBoPWQ&7k#g0hd^UJ3$}IdBKhHWS zL*=oE{L(pmIVx?Wg z6teB;%kHN6#FBXEqGl27?X%>DKbub(j|ximxwkF5N%`a&o`^9?p0SCyY=fC;OpMY^Ii!foOPb;pF|3 zYBs}ZR%EOz%~xU!%R*nPYm}NUkJH)Q{c)&JSfPI&;dRf8yw%ufBq)DdFEb+ebHAfr zzIn!T1*+0QaPYsjueU-D;@S)CbtahZ>`*-4^fE`|P?;{m|%E$SJfx!MJx##~^)8ZS)}VX0Vg+vhA%HlE;56}+AH(loLa%3-5l z{?O+4a4%l?k-e@@3bCpd}bG`LROB(?5c+VGKa;B zkkK7E%Z9=dg$JO}v%@M1zLw%Y@2j~}qXpBkbx0?W%q2P?QLxaaX@&~NU4($+MP2#> z%z6&*^=-{e8jiXig#ErH0hw3hie{Ug)@ZaMUAr-w#WOu;K{@OYy9k*zUPhLv3<-b* z9wfwB{8UYk38s`5g@&mI9DMo?2yoy_&x-J_u0vtQ-rh*OB0&Au;`TM@fl&Z&Mdib2 z`z(h%5H2Ovt9?4vGUTztz^`@z&59F3awwy1!<))g;>6BALsROfzfv6mz!=yPZ@TGV zbH7bvaQ!|8mb%r78XpQIl1U!r%8rZ*eox$WAW)ur_-G~bu)unEuN#}dg&6lH4`a+^j$qA zr^!7k>go8-6Kpa#Qgsb^f?09BD)v1es<(%-Hx`FM>H(BWddu5)hx0)y+89 z?xrapur_6~Bev;eq!Ndn+oTSvrJa#vHDA0!OU2r*U7T2>8+qUkh(w?S{B$|{F1i(3 zS|ri9bPu(mkPw9iC+b6jkQ-X4&q)VL5L3_^UVSf zUyGVrBLFxmCStaRheYb7HEpZ(#XcolNV1}%nrT9|7dBkLMShHfSjfqZSz+D`Hqgz3 z4d~DLo&1^qIglj<-{yPzv4lCDkd zI1qtvKJ`;JFG^1;ke?Z;$n#VR^4Ee|2SwZktnXNhX^P2g%%WM#cdokTm@nv7R~WVb z>up#X4trA#5uAd zd|bTi4EV(l*7nS2vY`H^w+sSQ2!o#E6g~VNhY^_2J1+pebJ~{c?x>dg(7of zyG_{3$4j;f;GN(XM(!$|myy-S>bNe+& z;a9je|E0_7Q=c%no+p$T63^7Mu~0+o4gkE9ML~(PDsb{yZ`xX^=0p2`L@{l|7Mpqb z$K>Z*ikqN|k~GSXEd-GVbdaNIm##A4V)KD34Znksvor|S94z50vEkr?|hy^`An z`l|$*X!JdM*ywLnmS!RLUvmQE?rkshKM<+>hPBN6Fx2n71^}ZtLht?a zr^8Sj-X|6F4EL#Jwt|(q7@JrU!j<`!QRl*=U%e^-V;bg*Hu(ffu;T@-360 zu*3DE(;!2Snsv<^!}o}thLy4nD>YLhUazz-@X2fwe+XO-onnjXA_ZkHj!XP=Hu zPo1O2HessWgJA#I+KO5=Z|AbQQ4Y-CJdbI^l#YtONdNAerH=3{$K4?i0KdY2ReR8% z0Fm?7QdM-(V2}bE@;KyheQ)hV+Gjcg$CHSbEZjN;S|bO_TD$gON0h|sMA^or-n1=> zLUD#D%cc#1w_sy2_2EJ4B~>%msprz+_5>#WT$^|NfrBecRat+3CtS7kGpP{T)cB^I z)=#kNxn8j>QMHPu(U@BJdeS55NQ6U>s!S5|z3ipyAJG=?(FH5fiGpN=mqOtF83wrK zxYbtNU8p_k!}mQgyI_EQPB^y!%2zb+MdR~NiAT7MKYleD7t%bvNhrQynONVF==h-G z+wpt|Vhd7gY0|U??JyQ_FD^B7{ws+Vpz6zcS4i~n4cXn=vtnb7PX$DFcz-WA-Id{+ zFq$uGvSC(abvEBr<36iqV?LlV4$`RWZ6+xvx`N9dk7QaVirDzZg@Q6H0Y1dIEoea4 z3;8cUQjS|%>EI+wqY(63UMZQ#+{;_0oONZi#fUK6+od{1uUvI`E5qz3LBPBGLB@@$ zVs&D5D}CUH;NG?TXL;pSI|@7xQ3m;l=$xWTIYOGTY{bC`+>HJgAq(Sk(lZqpIRq)G z&m3_VRE7+5(|>s1rVH>^~b0>^L|Qr27r>E zNrsiKj0zXGJy3kJG)YR1pq}u;rxD5!YwDo1X+-LvpJWOs7h-zAg zZ!b84y7SZ~GqbBHF2M|nmR>4PQz81qZ5k1DA<$p2YB=V5^7A0&0siSXXa zmZ{F<=KY6PiyY%RG|+X$*7V>1KIz``tgTV+u3=E0&5yH&K-1?*+A~uvxHPc#4{`+i znJg$+LSi`-4NeGPN4*TfxM00)KBAS+Rg{t2Srt%qNu|snSgJBD;NsbP&y3$P1I=}n ze%L8?-=F~K@vx^DqD+B*5J`jdoso)#%bKUW-IPY(S0L%Ot8X_P_hZsO{yE1s?X)0J zZ8WYvIvu`U;EK!^V|EY7ynx2DjD|JR&!Xu#QM1DvYCOKcKZaMHv;;=?PYn;eDuqrb zK_BO*j2>~Mdk#<7_fXl)v6!g*P}^4x`!-SerT}fZuqBCIlCIbmJV){)%~x*rARUAE zDi&0Na)r>qq{mXZy8UqxJ#Tj_CnR`o^UgP1fM)FQhsn2s!~Yr$OOO0=5UlFQt}YVn{?Gkk{9H!;^R>XxuBPX-D-aa?_>khNPQzEl9yH z{Kmr-&})Wcu`iNK4yRz{HA|J^0RUL9h5asG=(*`K|*k;ubT^>VMQd;^m`Ug&UzcGAzon> z+=UBB?g1(bHhQ9!m+I0wcc&MEoM^y}caPV{?4N z!&PZ7cre!948YovB#7O+lsv(gE?NsW8eiAM(yI?wc-7GO{DVx%*p_r&P;v2K{Pm>T z83695+H;#FQT?-7pfPQ1a!xd_2)sn?+(#AA?9aEZ5>J}lmCUnH&#$Q?g%4hq#uBFe z+Io}K!uMfFhdVx1MFl(FT{Y&{aeCw>0c=-E=&bBZ7gd6Uhyp3AL!X%TW}TYu1={9D zDr3ID)0O@X>ix1~w8=I_DBqwr{<`j|ziw*C*b*Mat7V?yLr)E-6N#LY@^H)+7~WJB zB?I9~WTr(K{57%yfl51GWfwnHNj5pXL>S4U-1V9AN9o(Ut1B0bDvpZw|`7;QoCv#1QhkFQbYutkF0496L{_cx}! zFw6Y2_R~M)Xkz*>ix>R>;9SHN%|rRXP8Bme{7aMB|B{mZ>w&I(pfWf6z3S1nv*X}X zQvE}f`^U@5@7@$hb&WiRS>*Rdv`@0oP7dba0Vz)jm-dOyFoOGk79g%EO5VhyL+{5M z2D7eSs(Y9pMbJd4zxV;pABB^SP3@QHY(?UalS^J%d8>90jd#b2YG}NPC#{Is_MkZ- zb=3uOlR>U*O9X-6-}p#eJ@c;fEm~ZAK7X=OH8QB5EJIh18qY_}VaH0>;#Vd8<`-TE z6`g)#yw~_G=I}9-XFbJHO);khLzD;}$ZIM#Lm9p`Zsv@MJFgShOGEpqvphZzJ14m9 zh&bqt+Fhhj6on)5C!fuxn3d^=X5O4O(bIf)H|$Zp{VeVe-aCUr!PUDxPSooCGn6T_ zJWK^uXNlRcPq2P2z^+XsF=uG8e+7YDVbhq(NBz7~>oqw_6#@j1#piqqn?uMreE?&~ z>rx>`Oddokkt!bqSVw}q2d8kEO=)pd|4neByp_91)6ObHU#Nc|k>n?=$40z8|8dRj zX}Y)WcLQc2H=;=7+&>U`Ro7xBw_uD7YAG$G1rb+v| zi920GkafD}a?biwDjPNecAAD3Q?@--C-ejR=xRDgwr$WwvrJWkE|QcVvi!oG9jK7d z$cMDR53iMu>v@j9wkQ^=xPR|83D>4uymxrzi!g?e`|xJMsy3#Fu@rDH9c*3X z5%tP3y_usemk0$B2Scnn1P?<3z}?L)8F+Wy`Na<1kOZSS5lK0J$pyb)M;G0I$>YO6 zk*E)pT^4?HkHkVewN!J-md%qttDhr^N(xKKrG%<1Wr=`h4Xv{+*80N-q%VDJfTqK` z?16Jn+JZqM=O~u!Q_XR->nka9aE}<72SlJ2S9K6sxwxNbBMM-symN00_G2!}{(eZf zZV-+e@Mb7u`e7_WsCJG$?3p@l{)%y;(UF3g3-zuET{D)lT~6AD!82+Wsg#E05H#FF zl;^58w6pI#$CZL}c@s!MSUeHW9E(oFi$X786WZkc>qVf9UN8@qv=$eqzVr26j|UeN zzwO?;)%Yos;PJF<;E=x}8V4DD`OPVBP=8C(H7i#0vdg5Gk)vS0CyR&N_;gG)lBH)I zE(=8#UH0Tf_vUg$^4y>9GkmZ9h{h!F1EH9TC=icTY_!8!SnIizoXU@$Qa0XHTxhuKrTpF@j1j4phDIox?0nE{)*LH3d!(jp{L73=$rx4Ltu=>OOldPb z*swu^Yj)-0+4*S4EKSkXuch`vV76#67F+z9E}bE~srAqN1yen`nv-?i-Mq#Fk*!m7 zzuF?xx4C3aS3}Rv3Yy^vI*N8C3^w2CqpBHcLo7j2<4BoMI# z9YGBxi6z|6WiW%Fbs0_U!$b|Y2dtWHg+h^t$RoH^(&>=A<_2!J?|u3@WhaPGlTWjw z_suBh{^QNrLA6CHC&*`w1gsu}I(&x*n+xR-o{dV@9*?@_L~Bxn$d3A|t>1 z{TT91 zi>l<>*bQ#>B8PAhI3}@=3ZV;7X;Y;8`(Dws3;R~rhAO8p9-N>*`H}M!QZvEt$VBR_ zK9R%F%G*2vzu1@ibNO>R_bMW$dql`Q^rs?ugA?TTJt46~=dlf0EwuH$R8Q8keP_V_ z12Ndu;w$7%l%(E{^!rUjVKZmrmxB7pFc&>6~UN;1JOx92(B2;sae!_JhRnvlV-;U

)9)?wB&Y1tF&=qbDUwUIDAyOv~L-?O4_ zc4E!I%|d^zsi$pZxwj4~CW)a?YuKntlwH|>|8m}irEszJdzwaA?X=!YI3-}wbT7Iq z+!`+1PFXl#_ZQ`q@C~>uj*w98EZ;6qP+|_0?06N-EC(208jpSv^S^8zr`*eXipH!2 zh1VFIV{6U(wnkI+kX(j@@7>7v2Qg{GFL&U)XQHl&y_LuK2RS^z5>!-+$VT_i{#n{z z#CHA8gvF4mWNCWD3duJsvY7m&;Gd2C-wZtqBgr)|%HUiAjm_DN_006ozM4$NcU8vM zMROz^e~M0b-5lDrUx!%^%Fxc+%E?Ja9?#H9A#P4QXa!N~9ekCD0l5t7*t4@QSz#4u z#dARbki;PP63;x|dNfnPt~bePjaW>`$3A#YhN>YW#Sfi4jAC!CYlYFhe7(D-`HSaJ zIVIkX|4ATlt}oD`)mhBFSp=&IFiE2PG?hsl+rlc{YVu{L6jnHwqi2k7wvdR5h}9t_ zHL9`=lUg}Vnj$FaI;fSc9#p=x)!G1FR2S9XH4T?f!vvHTa!+e5#pm@z!+p(8swDE| z?Pq;H4vWFzzuyl_+O@xVD>Z+~W3~FE83qNbKpg1^5)wN4uY~t#h>peUz9`3@E@-|v zZl$$gP!^N5aREP1On`@n>2QEf4_MfEhUWfdSk>iTHDS;5|HT%lLY%Eq5ZDA00{w z`LhQIpW8tD$r%##|A$$ei8~&po|B7|v{f%Y*Ud~>QfD;oH)G4uvGp0^h_6AD+ZiJc zjzL0-m$L0);+v4bg3Kl#PKZ9J0acamX%$_sjH(NFbqxcXNDvdTw2PjNA>%ysnxDE} z%tKKZ3^<3Fe$RSP7Y=M|R}NAk4O-9(m{@V?{m>5#cJ8Bng_~|<0ewa~j{+}^;9hn> zP7&@=1)@{IpjL!1Dft55~^( z4@8CKVNKaE-Jty9lYoGLmEK+vu7PYC3%-u6qMM9r2dMID!hrOxj55%Swq>O)2M4NP zzIcg=I6qrKB@vD#G`!Toj0(^SU4rr8GCUs{fimAKl8FEj08hpT%sLfF0n!V(4^)Ba zp9!P2T&isjj2RBR-pEmyBEUd5EbO;Akezw@-|x^1Sgv0n0C4XA&hvS#OFA#QE7?uvKb<+0njA^qn>*w_~#ve4Bc zf`;<;U34o)9uKvx z84J|()Zd}fqSNPzlmUp!tYhNLt4F@W{uuYp@?}2$T(3yMCrGQTOc8LuvBq(kOFt=D zQEB0gLSGiL*)%!A#C=O}2ARi1=OEk|8cqNrc>|in9(7Nt2A5!>GnF){>0{$1`6UIb zngUBHPKjK^1lDpQ3YIc#%>RcPYCtpttx~u)iR{ZV1}UyBiEfY*D|duQ_Yg?kP{m0i z%1pGyNL)dVo=v)fjg=Lrnq_mV{P-r#o;~itUye3fJ^c)~YxbdIo%uKIFD41f5582T z`lwQrnM4841wNt`>q_=zC`Cd5q7R?b*%3r+-6_(KWL^vb{NN#~`$1cDEN6%T13T*E^e+aeX3w~FX)PT=D$Hl`=m0ucQ1>2O z{7U#XWk=fXa}H*f2!&6^bM<-e&t6W?<@`nE+oBny$F$d21%4}w%*{m<$bG@Ixit#v z#F^6CA`sMs0fG;P@Qr1|eRGQ2y6KKTyhA9U@wVUuc)|kc;^9mc*wKnQ6xKbs;^^fz z9UZe6D1wb8y0Tf?+l5!%OGOA{XVR=Fq&;QG(zhFjGhH5v*C>9=lbAMw@bGo8A)%dP zs5VL-XnI~{VCN(+F;S2YaX8x>JfHZ2cEu&-M0HW=jLLmU>EX5%%JPR52T?o0sf=X% z^tB5|+SQ=M(jmEIeE7WcMZ@zoQ~O0VTV5rGX)%0AmvuVH(+^#x3=@(kmRn(oUpZ~6 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 diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.plymouth b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.plymouth index ab28f70..299b36b 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.plymouth +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.plymouth @@ -1,11 +1,8 @@ [Plymouth Theme] -Name=Script -Description=Script example plugin. +Name=UCS-4 +Description=Univention Corporate Server 4 ModuleName=script [script] ImageDir=/usr/share/plymouth/themes/ucs ScriptFile=/usr/share/plymouth/themes/ucs/ucs.script - -[script-env-vars] -example_env_var=example env var value diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.script b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.script index 0005b15..5618c25 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.script +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-bootsplash/ucs/ucs.script @@ -1,4 +1,4 @@ -# This is an example plymouth plugin script +# This is the Univention Corporate Server 4 plymouth plugin script # background image bg.image = Image("bg.png"); @@ -29,8 +29,8 @@ status = "normal"; line_height = Image.Text("AfpqtM").GetHeight(); -# to determine the mode of operation plymouth was started in use Plymouth.GetMode -# which returns a string of one of: "boot", "shutdown", "suspend", "resume" or unknown. +# to determine the mode of operation plymouth was started in use Plymouth.GetMode +# which returns a string of one of: "boot", "shutdown", "suspend", "resume" or unknown. #status = Plymouth.GetMode (); ########## @@ -156,7 +156,7 @@ fun ask_dialog() { for (i=0; i < ASK_PROMPT_LINES; i++) { prompt[i].sprite = Sprite(); - prompt[i].sprite.SetPosition(10, 50 + (20 * i), 10000); + prompt[i].sprite.SetPosition(10, 80 + (20 * i), 10000); } prompt.setText = fun (string) { @@ -192,7 +192,7 @@ fun ask_dialog() { prompt.y + 20, 10000 ); - }; + }; global.ask.prompt = prompt; global.ask.text = text; @@ -206,16 +206,16 @@ fun dialog_setup() { local.lock; local.entry; local.prompt; - + lock.image = Image("lock.png"); entry.image = Image("entry.png"); - + lock.sprite = Sprite(lock.image); lock.x = Window.GetX() + Window.GetWidth() / 2 - lock.image.GetWidth() / 2; lock.y = Window.GetY() + Window.GetHeight() / 2 - global.box.image.GetHeight() / 3; lock.z = 10000; lock.sprite.SetPosition(lock.x, lock.y, lock.z); - + entry.sprite = Sprite(entry.image); entry.x = Window.GetX() + Window.GetWidth() / 2 - entry.image.GetWidth() / 2; entry.y = Window.GetY() + Window.GetHeight() / 2 - entry.image.GetHeight() / 2; @@ -224,7 +224,7 @@ fun dialog_setup() { for (i=0; i < PASSWORD_PROMPT_LINES; i++) { prompt[i] = Sprite(); - prompt[i].SetPosition(10, 50 + (20 * i), 10000); + prompt[i].SetPosition(10, 80 + (20 * i), 10000); } prompt.setText = fun (string) { @@ -238,7 +238,7 @@ fun dialog_setup() { prompt[i].SetImage(msg); } }; - + global.dialog.lock = lock; global.dialog.entry = entry; global.dialog.prompt = prompt; @@ -288,7 +288,7 @@ fun display_normal_callback () { global.logo.sprite.SetOpacity(1.0); } -# the callback function is called when the display should return to normal +# the callback function is called when the display should return to normal Plymouth.SetDisplayNormalFunction(display_normal_callback); ############ @@ -329,7 +329,7 @@ fun display_password_callback (prompt, bullets) { } } -# the callback function is called when the display should display a +# the callback function is called when the display should display a # password dialogue. First arg is prompt string, the second is the number of bullets. Plymouth.SetDisplayPasswordFunction(display_password_callback); @@ -339,7 +339,7 @@ Plymouth.SetDisplayPasswordFunction(display_password_callback); statusmsg.sprite = Sprite(); statusmsg.sprite.SetX(Window.GetX() + Window.GetWidth() / 2 - box.image.GetWidth() / 2 + 5); -statusmsg.sprite.SetY(Window.GetY() + Window.GetHeight() / 2 + box.image.GetHeight() / 2); +statusmsg.sprite.SetY(Window.GetY() + Window.GetHeight() / 2 + box.image.GetHeight() / 2 + 40); fun update_status_callback (text) { local.image = Image.Text(text, 0, 0, 0); @@ -360,12 +360,12 @@ fun update_status_callback (text) { else image = Image.Text("Checking disk " + device + " (" + progress + "% complete)", 0, 0, 0); } - statusmsg.sprite.SetImage(image); + statusmsg.sprite.SetImage(image); } # the callback function is called with the new boot status string Plymouth.SetUpdateStatusFunction(update_status_callback); - + ######## # quit # ######## @@ -397,7 +397,7 @@ fun question_callback (prompt, string) { global.ask.text.setText(string); } -# the callback function is called when the display should display a question +# the callback function is called when the display should display a question # dialogue. First arg is prompt string, the second is the entry contents. Plymouth.SetDisplayQuestionFunction(question_callback); @@ -405,14 +405,14 @@ Plymouth.SetDisplayQuestionFunction(question_callback); # message # ########### -# message +# message message.sprite = Sprite(); -message.sprite.SetPosition(10, 5, 10000); +message.sprite.SetPosition(10, 40, 10000); message.maxLength = 100; # fsck action line message_action.sprite = Sprite(); -message_action.sprite.SetPosition(10, 30, 10000); +message_action.sprite.SetPosition(10, 60, 10000); message_action.maxLength = 100; fun message_callback (text) { @@ -440,7 +440,7 @@ fun message_callback (text) { } } -# he callback function is called when new message should be displayed. +# the callback function is called when new message should be displayed. # First arg is message to display. Plymouth.SetMessageFunction(message_callback); @@ -455,8 +455,7 @@ fun refresh_callback () { index = Math.Int(logo.count % 48); global.logo.sprite.SetImage(logo[index].image); } - -# calling Plymouth.SetRefreshFunction with a function will set that + +# calling Plymouth.SetRefreshFunction with a function will set that # function to be called up to 50 times every second Plymouth.SetRefreshFunction (refresh_callback); - -- 1.9.1