From 6693216e1e40a4f793c17f7a23d3793ecac69def Mon Sep 17 00:00:00 2001
From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Thu, 6 Jul 2006 20:15:31 +0000
Subject: [PATCH] Bugfixes:   * Framebufferdevices   * Bootscripts vergessen
 ;-)   * Hoffentlich den Doppel-Anmelde-Fehler behoben.   * Jetzt Tux im
 Konsolensplash.   * Libjpeg in ISO enthalten.   * Installer gefixt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@201 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 .../bootsplash/images/bootsplash-1024x768.jpg | Bin 11087 -> 18485 bytes
 config/cfgroot/header.pl                      |  11 ++++++--
 config/httpd/httpd.conf                       |   6 ++---
 doc/packages-list.txt                         |   1 -
 lfs/initscripts                               |   9 +++----
 lfs/makedev                                   |   5 ++--
 src/ROOTFILES.i386                            |  24 ++++++++++++++++++
 src/install+setup/install/main.c              |   4 +--
 8 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/config/bootsplash/images/bootsplash-1024x768.jpg b/config/bootsplash/images/bootsplash-1024x768.jpg
index 7fc98004793bcde6bd71db7f0afb533811fcca4f..e6d5eba64660c6c187246981db5d41eb258ab32d 100644
GIT binary patch
literal 18485
zcmeHu2UJtrx^C>fgwO;81*Nwbf}!uD6omj{2)%5GBm_i2q>8YQ((Bn<N)iHWKoXKr
zgd}wE8X(zHH-vzIA_M_x3L<V$%8UCdo;U7$cij7iXWVnfb7f?$IoABv{QvpQZ+@9s
zS=oBJH3m3tZhF}iuw%y#z$L*8ur&@4H3`F_0RT%&fHD98*e`eswyjNo*u|S(9=E)%
zoeIU?@;+tj?RCoRvgMVn5x_;jo?W|l@7}dXu-mg|&)$89_wN&I#||Aja2R+@NC<cg
z2n2~riGhSAM1Vl?)8Y~*Ps+&1fW&0a$V#7)l9rMF)W{COrTg~oJGy`WQE6eIu=Ia>
z+xj;EaQ`mAZosY`vVfhy9lL-#wpsy_fE|FHy9C|)y6xJ%W9QyI`vjGjkM9t4eeaHg
zdv@*;MBlv&0N5cY0fj&|yZ4HUoxX}ddi<OL{>%M7u594BzZUEhmb<VB@eHn{pV2yh
z(d1??6y+6kx9YK=DG5OcL72afvt!rpoqP5Q>J)&29CiZs393JVK4r24xO0~fNcc3^
zreOD9WY6t^T=3W$1{@Yt?gZ`v0*nBBBj%;F`)f$v7N9IJe`PKx%(R>Q(WXdd0g?$x
z-=wpn2g<s!YfY+h4E?pdR{^Oha@U5V(D^x3lLD5uX6k+H8X?L{G=Be6mbN8%3cHr!
zBqfL1Kct<HCr{aUZ{zXb;oq70*ARg-ZL?pI^U-1wz6Dsz)7WI*2$G|0aw&Pggj;U`
z#Q9r*IlJkqCo$1DQ^Y9p?FrFyPqJLOIrhI@bLfzFRAffRnWR*C{gV9s#Q)EH+{z!u
zY|6dO-vqa90S3x?bOnyO1puynl@M`!3!v#W^~1?uzkX(X!_wY>Er7$rU9jj<xY2+r
zpj&1RbZjLV0Ez$5+OpyKZ->V>D>eT_6l`*hmSi%v0843~#2((e1;F02HySolA}P_f
z0JNoOjm?!Cx6j^5YLXJ9e4N<WVN-4XQ6%Do$~^Mb%n{R}PseK&mG-|vB|jYseraxV
z`>EgW(;@B?aM$1Azr(*X^Xgwh1h1kQ<?v_E%-*NAJKuID|HNQ0npW#)spZm%1d<;O
zk0<I*_5@v>SoCcev3XyYc4Z6TQ?sxZJ$jy(z9VF@Iy7Fyx6SeCpk+v=qe*d)iw(5x
z))bC&_$C{Miis4~{b5opH2BUT>)&X{dP%bChES`ftc5yC;41X_Ldi!fAD5^jp|^bu
z2SI)N6dM|7ubiSTJ~(O<8fyPLV?C`tSGrj)yK-bZKC!=cUE=lo{yXIg+o<?UQiZQy
zR}^5^j*`tP;x$m!Q^lOI!O-fW1)VQ(T&%x>{-$H{{JHxD?%R`A>F!6}IDTCg>5t3b
z_?ZoFhpEl`3OaQ&xuL!}mi$szkc?DQ+6W<A=AP^5a5`f<OrXJ6&~|@=bqykQZlA1y
zsvGTXXkyA>x5Mxwwn4Z4+OGb3_Je5t-)3(`tloUDcjF5o+%I96t?#x$GrKZepYz_S
z8J+HbwX!%lAM)%AALK7#d=tNdzEVo*og43X`d{Te9#J&d@}2hYwEqvNz3tXL!IYSJ
z|33e3Gy4Q;=PoR4tG)3*sy*o|sPCA-K*%G*Q5Qd}J^ah;|LQU#UqKI~1ukP<!&v{U
z_Tl9(Cim53RK9{P=?hFI-+$X=nA@}etI61Z1^q2tU^0fI+a}|?J^R0!O!-&PskZ`?
zxzn_5GJ{`c|KFL6>sQcU1g3iH<8ABTKATL%m)ZY!CR4u+`pW2MlX3fxCi9*4Pu~8W
z_Rmw|tC0WwBlWx5KReM^|M+e)X2bmdp2>V)$^5e|AOjoEYyqCmM{nHP0zA=HCZ3Ic
z@2s)$^A_Mt-6-Pfb@-KO6ilJDZEw(@`!J|nfOTThkxS3|Qy&}3D?;UhuAbk$iu<)c
zwd>L|5a09O)${)(kcqvTpOZ-uXMIjs6Se<y#*b4@{d>y)HJGIW`>@B}2RD37$1gA4
z6aNe4V+0|;rsQhmkL=?<QKKaC!mMz<I5<WkzlI{Hi~SQWI4P(r*uLQBM=J-dza+!D
zza9C(>X&RT{MnxA)Poxb{){3?__=mF^4OmNey*cP-u;HKyd8!DRv`Gte;(*W5NfYx
zybe)_@0tAXd%Y8nwdECq@Spa<NB*Lf0}|Ga`_$i0h0ooUZ*4pJrMH#fi(l9gsAu*w
zIm`2Yo~qudl=QXp1F55TwC@YIqTXWcLO1W)uM`D2oxj4%-2xQQ^tJ#$xDTXuc|X4>
zsEaFov#}%E={&S3_=w|+4-)i8@AhnXKO0Exhhm~%`E+jqei!?{T<sJJB?o+NNl;e!
zQoj0+El<x{O+9#h?Bb`KL-Q$mg!{DyM?Pgd8uj3{kJZ>a=%>zxf4E;q(YyEipB)uk
zGCylI_NYvf&|4q(C+Z(qX1w;@j>UNWpHldL7yxdq#+>OC<3>T59$~xuXD>gW|0gML
z=l1t`eiGLwRsHmtUV*qiscPpY<A$&4>?d*kZ<6_cmCt`J0c+g09@Yr=r?!=1h<>oP
zEeLBo#qh^%sZ9A;<4(7B{@dXxh~_Sxlukf53Ic%OzV!)t!M)S}$@hP$Q{V8u@%N^_
zGw_{(?+kor;5!5VvJ5~DcgnJVJ@b#te+O>w-lv|ek5R|7(imap&f;@Hzj%}ti_5u}
z_eg-RmTOYPy|6gauNP}n$GRQ;jL#P0f^@E4d6^}TkNv18^+JB2QCoQ8Zu51gFt;Cn
z86Yx$OucSd_vz87Z@ul(YymIreb<65X6C|JaNLRtk@8%&up1qa;5uIGm{%8<6?p$;
zLyI#P1k@y>!|gFP$1B>59l2T3UL**t-l^7EFN}TGZFoLKx4^Awm6I_U(~<9Q0&D*R
z80uuR7$dy+{%3oZQxRIn3~S$_nG-)Q|0t$>$aQ(CbxhSy?kJgN3Cb=@zA=+nl8Ku*
zSgo&Wv*g>xh1)2IxrPKnj;X&$rUoVkRUD@0$a{*wDkd_HEckTUsYz#nuaJHa`qq4W
zYEON!m!RoX_{1WHk>oQMQ4QtVp7X;e`tVY`4kNr$B7shhUNmuc(&=PpebiWwq+WTC
zJ^IE6@_2GzM~eRDQKE7@86#7ibL$VJ^l=`>>SRDtn6nPi^Yo2A-ApRg(*-5?IsIU@
zXOil~%e20M)5XQX=1eByP#|l)5XbkErJ~P{F9pU1-4#3$fSp<{n`OJjrG(j{W4z+X
z|A_tqAaK;F?07o0zGxq<#Q_O7?ksAUf0%+6LkD<1uR{Asr%&|`Po9;O??_d=jymB?
z$|LDd5wt_*+hWDd7l0qGIQG$jv8robm6O700}+{1pkdQ<Nn8r7o^{;G*jRs4z9MO*
zaYesd7IVUvCz_g@Q8sDEY%oVhU1BKXSI>`wk9UB*ug|d0mIcOCAW&J|Xxp;rBv({s
z`#E;OuZN_*b+0>3RnO4L!tg#%b*CRacuC&$Ie)Ad*dp&Nv5tmx7%!djiOcAPH61<L
zG2TCo4nDxENV1z(N>cPoJBNfJ?uokIY!N)@Gc=ffRD}ptxz%?sKCQ&1P;Rd!KGbU@
z`)1PB^@qNPJI6@3>F^P!hY52?CQag@g`fLXl7D~AVf#7GhpsXhjn{(Ct940{KkO-L
z8YB&bJ)@fKv+h1v>*Hy7C@j-dGY{>~y?grQl6Ex7^E7{iE&9vM!hCcKKFGxd?rf#@
zB1aGXBK5*?$rC?)V}hK<XWHz<YGJd1RX$>ykzrL9mibPO^d!n-#zojlmDSairC#9*
z%QTTlF;&Hm!w8^~993#MqrLIgVu$l(bX##yN~L8WT&KJXIW*%iD9mx8yPw1uPbRV>
zGp?5|)F!S@7R)|hKN*_``bC)*Zj%R_m~N1N+H!O)R8`HdOin_Td}Q*hoxW?}x@}*B
z%w7*$-yWrf!-$4Q-r;tQ`^0R6oqG@R0wTRYJXaBenY0HYzc)h{()pc6c5Zt5K2-jE
z(YnP6+^9G?sgS}d#pa){$nw|+WIY`*n=O<LjfX(D09P7LKJCHT6_(`HW(*Z7*;J30
ztvdE#bY7{h;wq>S4~QC#YPpd%VXLmR6&nqq#c^4*Pdwdt;zA7wgS1g+OvA2q<w>~`
zyUK{YYSQtNUPuUx6~h)<(d<YPhj8K?c8q-6Vc8LVcU4h602w@1fr(4+fL4j&TJ!H6
zu85N4+8tRAFTe=fSkfp8N4)Y%eO9k0brX4G?^d19EOx$+)vIRLT6$m>XJ=ijQcjCN
zEP;dI!`48I%v#2WvKA}w<iz}lj`=g&?qDZBEN$G@df6}cmhpv{wa(w~>Ey~{aal}b
zbN#8%6CP=9uEw3va%uaMtd*|f3=bn%1P=~BRem~KO&=7-eDwm>(LD~Mr1!eN&Ft*e
zT&|r{(}VY~EBm)Nce0(x<-*hD3XSI{W4xpsiuv;;3=(SJU)c^_nL+dygr)GoT(B0u
zVR;hPbuKE^KDF_u{DjfvZ>#OyS<o)%1?_%Q=mmwAQncr7181Esj8KQOIICL{Y@OXZ
zhbMZrh$`nj2<FAepXx9ad3}(G(pn$zgAwz`hfIBVvRo@R0lTSOu!juPMu>)h^9G7n
zQPz_0{3f1+)T2>GBCQ^q^X5v`4KuTN{BoPmLhT%1R;_jf9=HWiwMGnAHNaGKZ?<Ka
zx1(#Ilot2|$`1+oSn3eS>;+qvPLU^V4Xm^$##WP};n!%Bno|{qhf*4R=cvB)waX?=
zAN)K^*b3qpo1W*9cN`gI3KNSFAzAMnxdiINm_zk(MP1|sX7wCBp)ikUIdN=x$!7hp
z(Ke-nNkl~YM?-n}kSykivqR4+W5U|!XU!L>WN4-{$3=e@bAT;2)t6(TLqN;ROZ(+I
zOnjtIrW&|&swd*?u@z9Ta^tPdj4Tlkh`FJ*k$IzRRqzMYddF|H)#A7n&a7w2<9cb;
zmMcQvQuHUt{JkeFOCKdkBCTgGvmB>rWv!D#ArezT39%zGV{x5a@r#G=PrjK;<cKF?
zT~=r#y#73<1$M(CAkLbXd7-;pGze>?$dZn2V@2h^vHLkScnfgUNHIL*)+`T$l9?i&
z9SC?IXd=u7#u%%IL$nEOJb4xEaihC2g1TBzsGC#F!e-vkW~a%rXe#EOo~WrTWwyv_
zo;<s~q_E*q5_w$a#O0$3DdW_!)eZGVFdP3?xrWK8NxIn;9H~@1e>15&*@4biWKj}V
zS-#|-NbOK%^1695q~;g3zKR1OOD?7$e?L(hBgHiX2^}a33G0#cU4IxM8e(&t&@G?H
z#-A2iD${`ov$geIOL^0G<AE5?^X1qk-D>Ch4?c-;)$eS4jeD_hq!7W_B7w<Bh9%!V
zupttRwE7Jev6TP(<`!TKbC+62-vW5KcVOG57P$ixiu1fR`gpf=DkRoMZD9hspRy_l
zbppc}861k2QuMZh(E`D-4hGJSN#6MEpZ)A^U(QMmx3X4wH^*^7{2&JYhEwt|m!}G7
z@G`c)a9a{quy2pOolxCduWqz_-it|&RAmZoXVk$F8+!wDJMM>UH3f?4aKzwTeCEe<
z^L0T;!t%p(oh?8{{Rh<8gt|{*PB)t}8a=7rmsfAs_>!?MsYQyww~8|>tlH~8YIWAm
z>2)NIYxt}tR!I451cK8v=T?)@4TsF-CXf)B-rq)_oek1j61@d)Ws9^%dj2SI^{{|O
zGtj1}NHEIQI2a|f`#f~qOW&(FThbWLgJf~F*e-_Fke}$(9QcZHtC_u%MbAA(;i#YL
zD?;hqTw($Tu&Fy&lSJpMQlGfk|5934G*y$__OdKCM1K!*5Cp>7fsdh%`&&9#KnG*w
z+KP)^FG%}sNDxIB$hU<UZrPKk*0aIqc@Geeo#E@Ra4R>fjas8cJ)ju|DmoiVN+zgv
z)e-w&+A&id;2`VJH1J@X^7@@eo34<LC3M>^B)sE@!$gblV#s_hKJe16;vc`=!0qyp
zJK>WPM}~UiOW-CQPRcpDqp_)__SS?7kQaC$jRS=wl@>yheR~_!bnKUA%p8sOW{IFL
zD=Qbzdt^&%-yIn%@Lh7_E4(YQUvj5RZqB?h$qd3^EpM%3iLOmA{4F0HF)4<mz+sq*
z05_TEbH6k4du><X>scMUbsxpgcPqXsS0;-SJ)NAL+A?#Ioh!zk$%2(@zdW@hVJ;ib
z?l}VO<obeb*FDo3k!oSog)(q8N1;7|c-lXPuZm?UC3$Z;DCIWi6uq?qhwG0T#n#jm
z5@5Gg;Ie^u0_KF%xDrW`1nba!MVpS(@tS`+vaUPe%}gpfFqf{yMi}vQP$|)dl&4NM
zNH7@*HTF}YTlEc(+#N4_WNSlqZ>Q=OoBNf)Zu`{Uj`XGG)l!YRj=n~<*Rka_L@4+n
z5vGkL1c``I3j8C}PBaLq4dtyj9}P`!TusxEK;N`s=)SFB`7WoY$#c!SqgzN3)8XOO
zK_3Wo>o(}q#5exttY{0XbMn_eq)9~F?*iL;7-?hkr1GAjy13RVs+C~yQbdGs5p%pU
z#pAkPd~Wtcx9n)xXkTJsKvuG&ydvO-ZzhF9gLkr^p7C)HbIgk<3yYEJxj-1?&4_rL
z8ZWh7#d$xKsA*4&PbiGYi>;W+Kze9)rQLkD2F!5EKVsz)c-j4`vx+`9eGT=YU_!aW
zwxL-yd#)_3pBji%>S;U63~QHflr5OpOeKb=-yEy+<x|q+N99!?b$~YgwIXxs(TjYj
znkOp0Fk%ZZnw#6Eg|Gx$f(8HZF}_%=p&WL(G9g)s;A!Z7HcC0!Y2K%>B&~MMpuQw=
z?KHD8F$S)iLiOuHnnpy4JK6AT{io9M?+s4W>frmUX3GshkM4Jsr#$6Z!jLi?(@y-j
zwX@Z$p~Fu{oE&>*Xf$ku{&^7*Hg`GxzR<7=0VAGQYY)<VV-R@%MVdT8kuXP;HB^K-
zsqp=1d_TFv8@BA<DXd<1F&9f4uorw?@9H0_s(gY6&Be-fa_TjXwUn-ii770Zi;unY
zHVREBTQv`$O=y|1qA`ejh87gU3w0`<L?M;naI?6qlkrNg9jfWH<Z;RtKorNOqSghE
zW_P6LQCL@F^CTM2MkKaP4)J0t0;+MHibLruvrz^cwO(FLC$Va(^4Ko8=Ri9#>TnI{
zm|4=fSS!7FHnI2EIn;s2eO+0%brR#Vv5%43bY6dh)hlZD&mWl4wD??27Do(2w!K=;
zOL^uj+;(Z_m2V@Wolz2OKb3@pi*OW7_t5>Au2{su(Cd>EShhOidE;RlxaE~5EF58V
zNXIitGr@+x;EBWIAHNLj?ksDt5~a0v!hfX~`uWVxlBe}Z$;xF4P?8q+EqPiA?Ojy_
zMF?|`IDCkk84@?S2(r`;2{PKB5T+ko?d$j$z0`>2O6sXoL!VFbAm?~wTTXcR$C{o5
z`9SN?MdlI_DJmQ}T^<q}>hVN+uWFb#UxmCf9K6~4)*E#@a^DdQYmwnF#En55VAElj
z;=0tL<D88P_zR`;r6ig;AGd6Z5K*s8#Fv=CO>Dr*Qla}GcE#Dq2hr|Imr<NWo|B2z
zFk9mSHfg5Ks=i&>-s^-<`??OzT#3O(y>l{KLZ}81p?2?c@7S8L-Ch7$4ud*0Itg==
z)s7=7B_w&cj5}(rAYkt;SPonhut4*XqI?O*@q1yuoR*%fAIuNTrJQZMS+%ga(7FW(
zuOhFjT;6bqEFPwgMna|R54ffVrXa;nMLt(cB{>y3@UQzmtSM*LvZx9NOySO@H;L$R
zp6fuyumfAkulBm~KxGPMz5mTeo#sQyjEB^7-C#!jq2@(;O*&UFK_oDIPF~s{M;zX?
z>#@3GY+S{;2JS{@LKwXSPtCTbrnqYDERmVv_4l+tOjx}-Q^}VIesU8+Px9(o>M{Nx
zcH_J<Eg?mYGVR=}Wgk<&sm$(9)+sNER|!K}+AU{~4Xsr#y+;oTm+ta>_-$l&xrMF$
zxB2qhiX@i8J{i^)fJy!%<PZ0a0sPzW7i$M_?2}_XA}%(@Jj0w4E($j19L(Evin8Tw
z0aV^+OjTU1h>1QNz1f&Nx|l4Uqo>1uM4W$8bfANw?U8>BmBKHbmy;k%G+$Y&6?k|8
zV*|l^o3MI8naZf91|-p_h{b0o!wYFnltQCWa$GG-YPxEwz;2+uWVHbIcrH-b)GWu}
zN{H?jX%+fvEIB6I|Cqk@NiWn}YWbs~ck0qOIz1tQC94^)@Y~1z)X~8N+@_RL`qWHV
zxq6y3wvg&WL`jn!C&k-348^+<SLh;a*l8wnBiutoyZ;r^Kh`k{7Ri%Kp?49m6`}_D
zg<-cfTHu|l?lpWZQpfp49xpwo?U9-alV6C(cff-$OqMb8#V|$UTwB2kTCeeAgc@Yr
z7evS_XGV5by&ha+vQN0IxsR!DN?)JpF~#E87_kbJiFQb!2?PRMWV;>F_hO3Ln24JK
z<5cXeMf}}?WUQSxZgrk++AZBjiz>q#PoAp@8{v9j2o;l(v_(;-vx5(km$I&nULB{_
zl;cSy8%9d1s-B#m2w18zO$v>=h0zc1G+qr%@sKEb)^tcGB^5oOl#Oo*L?U&RiFC;a
zdGajfBu}663PndregiBQB=k;p;4HCyIM*iT$ANO?_U?f4+L#sKg1b7VRo$3BTweS5
zDkpV(mbRafKHXoLCm&H9q6co*vq*VJ#5C$0wO_1*CBX<N>LafG>&26g6z64M{8U4d
zE5~)oJZVELIZTx?b3v+INE;WVaVI=dUR06%?o8TIztZJiTNHyf@#Z<%Kp)1M9K7Ay
z>9_<E<}D^QBR)3G!3u|EF%u^PHTh+$x1E(XY^@|)ey@F_TzmUc6%$YGj*@v@`@ACg
zKrs-i5w%vuV2n|ptlM(jWX_+!rr3jx#D2d%TR6}yFW98w6<3wU!=6xa8zL($GUG!C
z-ASFcKf-@BF!}M@Oq@}6K>68`XFQWg5s1*ZTT@SD&mI#yI|kAfG$<bFasNHG11&S%
zQHn0^a}(iN61iqe7CHRurLW3;Ybv$?6GHdXAE5_`)uO?Obhb~}Kvw23l2A|b;!O5t
z0XK84d_#ygfLSaYN$7bd59^;QSjTp`)sqi}VMk>6aD|NvD~zc4>{gERAd~!#Cuz~a
zFDkRbN4OWln7UTxLo?6&;T+dsON;DcoifVX;^eASby0SDoN#qbB6Xm&*T8JHomuI<
zkeO*JwMXl9Mawlh6-^B?mDw{}!nsEZ!Lo+9(C&!96!EIG)rr?)rh($^#i<#Ctq3jC
zlVO`3*{Q-jP>Lxm*qjG6k!gWns5zlira2T6c5@{(UmbOAnrL0@wv*M}_d=~$r)VF=
z%M0a^mJ1ZDjCWx+wfzc=Km;YWXjJq@r0qlqA}iP@G_@FMpM_@``r3uu;_QH%VMKID
zK69DFMz6!7>uJl=pe(EE5Vou|d}ykIHmwpVvrlUf%8LUp`U-p4S{-VXhFG1Wnd(2I
zt-iT2lyY0i*$Hl9yWSfh_;$cE2s4iK3QZoLMi_uotlLB~kwcx6vu!#Y4c!h_V9&bX
z>ywoIA(ISKr)Bv1Lx(XcL3NQDbq8**Lzb#cpLgUU?S7WN5&ko0^Kv^z;>md+&;@SI
zDtY|a-gsyUI@Gh~g9}}Ud$^e0Pi|7|xb4jO`1Au?!@2dGhgb##BU2C>N9V-hmyv}=
z7Tj^~mY8(IYJ)mk1HamV<8S>|lPx6S3I{2}PF(9lt=(EynWWCqTjREkYqMEpcb3A|
zEG<gvR&%Um4yoLzk3zh4m=wv)Z5ly3u(jCU`9qzH&+ag@k?wp1qlT{`>Flgjl|aDe
zmCBb!;H%c@oheJO!i*no1biFW3tHLPv&+uedxQ7OA~*Iy)a#(+7*6(ITw$%<OUWJl
zS995PFY%`~f?HpbERN~~kf$m^FQv@Q<r&<1H6Kxk8wwT6^{~@I7+O@?Bd&Q3O?rta
z$&>D@p`G|GkNiU&9z(~^^jZd`8F-hGk5*TQ)T;7e3+yV#7HB{nMz~k}>WCCF7!~r)
zsdaq>T#^)vNLlkoW)iy%0!B5HZgL)<L<V~%`2`TcLE;`Movq<|FLTU$qyjF3fZ}Gh
zr$~*?Q{WaUqbVg&(4_jc;GtgIb<GW2rzf$J11l{6LZroiFY0O%?loKFEc+%Vr$Bw#
z{^IaS$fOL&h;KIk@{Lbmv)c3)z+do}#gmqe6VAC4rBi(?)h%HH4JqhTir$X55mc1H
zDR-osw5~l&3W>cT&5?9cOqflpb7!U~hBpM&CHQTe*aAqcOv{wJxdz5G<*-tC7M;~}
z+?v4=ooHOR<C^`6Jd(t>yyJhM)`2}>bW6oPSf^}e<JmMcg`{5}b+G6Bk*uhIxZ!S<
zLM&Bxg6fvO&s0?NUK;(0+XFM(6{KJ>-O9my%q}Q0n$SNpj)Gf1xtUZ+627imf*ZC|
zrTPw5@iT9<G?jXK_MK%|sE@uamlzahAGE9Oz54D~zG9bkPHuSjxdxX%Uen6-YAUN)
z#d_WZud>`Qi@p{wMt2Er{=E-_onl+&_sHJ1i2CB4M-pQYYD-t;`SiNERUE^nDity%
z4?Zl`vYiUCRqAmME-54arbJ;_<lRytg3u7zHhi|j_2$<YQD!$3-Z)#zS1VIl>zp|E
z&JdwI1Q`@Idt+O<Fw&O6e3d5pOeEiS7#_@9+_>-5o2ukZlGR*0Pw@0e3VL%Rs3*xy
z0ptOJ^cS@*(z7CRPlkYv&S*c=vV`<=E8ZdWTT*N21fL7<HQXf6B4GN0@4ykm^a(bv
z69G{D;hRmaV;82#=Rp=dx25vvgjyV;+4n#OC)?4(N;FW~5|%(d(-!t4L6^b;BE9kg
zsS)``pwZz#LUyJ$-2;lS)R}l`<KKpa^`c<mh;u6?^s2%@QUWJZccksg3))7s*kpr1
zd6QEJ-&W32E9Z^X0c;Ipt=0Tpr@4xSif*$bCd|G{8OaXo!CjOxjwayahA32B((z#%
zEi0j<65L!OE0SnyQOi<jkwWGf_&`mCYP2`P)eNH#m|(4)HiBSlzJq}xit=7eVlZ8}
zm|k#gstPSDG!zLkvkmS(9#=n8NtUReo|L3I4PyO_r~#=(V-wBha_(Zm?W-Nix`jbK
z_pRRyWJVv!1%F(ja?$U?3=hi7Hn?~i+SH#LXM^%27Lzk%Mg_l~c&rx?{QM8(zZdEB
zCu_L1tIkgxR3zmO3;C4sKpEifPXB5RWwnKy<F0w2SNU;IfN}mjBPqLC9F6L!@P~<O
zY_9wM4nw%Jo+Vr%O<tMOs2wAWp%dwY2WD6(aU0DFMZXv*75BK(XrDIUO=Jyo;%tXg
zv{ZfC6(?ha=H%QQ)$Ikpd5>eb&o1A;eXH?DpKj8E7hc02pQ%%5>Et3A>vELwp@3y0
z1+NeXE^E=&(d^B+#~-T)q`(`YF`<ss025b+S(gmZ4+sJ(i;Tc~+LBF6^4<={m8;Kj
zud^!%X%y;n5O6$HDM~GJgzKhp9(gvm#=Xt1GpwL<*0nl;nm%M#GHWS{>%FU6@QYvt
zuVj%#XXCLg_E1yvX3aXRl_o_r$g&A?XsMk~SZr62$ms7KxWB&;PmQviAydd88IscT
zwr73KDg;}qd|zF8#miBG5aNQlVyKQPaVAZ=TfPsRR=oaH#pVP?)X&dTj!)Yx&e7{e
zAbsPz$}0$&cC{T6Wwq9a<)IqB;nk#}X&*wfce|X1(#xhWs!EEa4NpV2C4m(&iB6MG
zTx;B@pHiqwVRou9m{g@gw7HrR6-QOz7e_cx(g_}R;#Q7V6XzE-Xp!&fKn>|Am1h`N
z#JOVI;O2X9Q&=CxXXndrG+LdSox5)924;2~g3TfeqYi~YTg{wu?<>WAl!Ud6y;BQ&
zRtW^X4O?mr_7LiRV9hB@S93w!Y_JQP$o{Zc=iAzaSTds|HEXSt91~Ny;;jbzHzZIW
zDocD$aXL9&T6tt^#)r7_{YLopcHLaJ!ByYug7r}6)0W>V@kz}p??Z6hCCpHK@QH;%
z$S?xl;y{uw$+~ZA-9_+Cu)jK;1046nljJ5gB%F<raiB$Ck=E*@f}VI_73nD{Blikd
z%dAVJxWc{-dhT_|gwepj`%2)FP5FxxbH4sqsCC=!%>{|YgxJ~}JemFvafQdGqM-~r
zg}0zxP!hkE>zt8Cwr9|N!HZe-D*^%9y+j&Y8J$>$d33vzkp?R2>NGtGPfW#bDU(L0
zbxfHR%_Yj4##jzY!!?BCy@LE;)F@>ntE-s&#I3H4?%E2=xC${66+889#%8a_Pm--;
zBf9c|CI<@pLj6SPGSEmkCRG2pnhAq0`j(RN8lBtQad$BIx0<V6dU$eB_5tQXw07`%
zKLpvJLwzn)q80^9*Xj=piyXD{sevHt72ucs-9Jv}7`@ORHH@f%@EY>+jw&#v{P7zf
zyZF<zAOq(ja+|(2I_!;h<`Qmw)anzc9<|I*jt~hH?`cba1FVnx)Ko*Wt!PullyAut
zEd+wBYri{4dY&4r%B>@WTB{#&&I$MQE4DxJj2)^IknE6yeO@|j^(rv86Y+RgI8BtU
NW@ZD}X|^@=zW`+J_jmvR

literal 11087
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

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 805489c67..2e621fb8a 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -721,7 +721,7 @@ sub openpage {
     my $h2 = gettitle($menu);
     my $helpuri = get_helpuri();
 
-    $title = "IPFire - $title $FIREBUILD";
+    $title = "IPFire - $title";
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         $title =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; 
     }
@@ -737,8 +737,15 @@ sub openpage {
 
     $extrahead
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+END
+;
+    if ($settings{'FX'} eq 'on') {
+	print <<END
     <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)">
     <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)">
+    } else { 
+	print <<END 
+    }
     <link rel="shortcut icon" href="/favicon.ico" />
     <style type="text/css">\@import url(/include/style.css);</style>
     <style type="text/css">\@import url(/include/menu.css);</style>
@@ -809,7 +816,7 @@ sub closepage () {
     print <<END
 	  <div align="center">
             <p>
-	      <div style="font-size: 9px"><b>Status:</b> $status <b>Uptime:</b>$uptime</div>
+	      <div style="font-size: 9px"><b>Status:</b> $status <b>Uptime:</b>$uptime <b>Version:</b> $FIREBUILD</div> 
             </p>
           </div>
 	</body>
diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf
index 9ce0e7177..5c2c6aea6 100644
--- a/config/httpd/httpd.conf
+++ b/config/httpd/httpd.conf
@@ -1,8 +1,6 @@
 ##
 ## httpd.conf -- Apache HTTP server configuration file
 ##
-## $Id: httpd.conf,v 1.15.2.7 2005/04/16 11:40:15 rkerr Exp $
-##
 ServerType standalone
 ServerRoot /etc/httpd
 
@@ -42,7 +40,7 @@ RewriteRule .* - [F]
     Allow from all
 </Directory>
 <DirectoryMatch "/home/httpd/html/(graphs|sgraph)">
-    AuthName "Restricted"
+    AuthName "IPFire - Restricted"
     AuthType Basic
     AuthUserFile /var/ipfire/auth/users
     Require user admin
@@ -144,7 +142,7 @@ SSLLogLevel info
 <Directory /home/httpd/html/backup>
     Options None
     AllowOverride None
-    AuthName "Restricted"
+    AuthName "IPFire - Restricted"
     AuthType Basic
     AuthUserFile /var/ipfire/auth/users
     require user admin
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d51f1fbea..a50971dda 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -43,7 +43,6 @@
   * bind-9.2.5
   * binutils-2.15.90.0.3
   * bison-1.875
-  * bootsplash-3.0.7
   * bootsplash-3.2
   * bridge-utils-1.1
   * busybox-0.60.5
diff --git a/lfs/initscripts b/lfs/initscripts
index 23508ab57..24dc94d99 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: initscripts,v 1.6.2.2 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -69,4 +63,7 @@ $(TARGET) :
 	chgrp nobody /etc/rc.d/rc.red
 	chmod 4750 /etc/rc.d/rc.red
 
+	-mkdir -p /etc/boot.d
+	cp -f $(DIR_SRC)/src/boot.d/* /etc/boot.d
+
 	@$(POSTBUILD)
diff --git a/lfs/makedev b/lfs/makedev
index 061309dc9..1b8543577 100644
--- a/lfs/makedev
+++ b/lfs/makedev
@@ -122,8 +122,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd /dev && ln -sf fd0 floppy
 
 	# Nodes for Framebuffer
-	for i in 0 1 2 3 4 5 6 7; do
-		mknod /dev/fb$i c 29 $[$i * 32]
+	for i in `seq 0 7` 12; do \
+		rm -f /dev/fb$$; \
+		mknod /dev/fb$$i c 29 $$(($$i * 32)); \
 	done
 
 	@$(POSTBUILD)
diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 399e67f9b..919d18157 100644
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -19620,6 +19620,28 @@ usr/lib/libpng.so.3.1.2.8
 #usr/share/man/man3/libpngpf.3
 #usr/share/man/man5/png.5
 ##
+## jpegsrc.v6b
+##
+usr/bin/cjpeg
+usr/bin/djpeg
+usr/bin/jpegtran
+usr/bin/rdjpgcom
+usr/bin/wrjpgcom
+#usr/include/jconfig.h
+#usr/include/jerror.h
+#usr/include/jmorecfg.h
+#usr/include/jpeglib.h
+usr/lib/libjpeg.a
+usr/lib/libjpeg.la
+usr/lib/libjpeg.so
+usr/lib/libjpeg.so.62
+usr/lib/libjpeg.so.62.0.0
+#usr/share/man/man1/cjpeg.1
+#usr/share/man/man1/djpeg.1
+#usr/share/man/man1/jpegtran.1
+#usr/share/man/man1/rdjpgcom.1
+#usr/share/man/man1/wrjpgcom.1
+##
 ## libsafe-2.0-16
 ##
 etc/ld.so.preload
@@ -22252,6 +22274,7 @@ etc/rc.d/rc.red
 etc/rc.d/rc.sysinit
 etc/rc.d/rc.updatered
 etc/init.d
+etc/boot.d
 ##
 ## iptables-1.3.4
 ##
@@ -26586,6 +26609,7 @@ sbin/splash
 sbin/bootanim
 sbin/fbmngplay
 sbin/fbresolution
+sbin/fbtruetype
 boot/splash
 ##
 ## lcms
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 2b34d6221..1330b4099 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -954,9 +954,9 @@ RESTORE:
 	}
 	/* Set Bootsplash */
 	if ((handle = fopen("/scsidriver", "r")))
-		mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /boot/ipfirerd.img");
+		mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd.img");
 	else
-		mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf > /boot/initrd.splash");
+		mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf > /harddisk/boot/initrd.splash");
 	mysystem("/bin/chroot /harddisk /bin/umount -n /proc");
 #endif
 #ifdef __alpha__