From 0ddf0594ddae080564606e4b36d6b5f3443a670e Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Thu, 14 Apr 2011 23:55:15 +0200 Subject: [PATCH 1/8] Some new icons for the webif (send in by traxxus). --- html/html/images/delete.gif | Bin 153 -> 1879 bytes html/html/images/document-save.png | Bin 911 -> 1572 bytes html/html/images/edit.gif | Bin 131 -> 1726 bytes html/html/images/floppy.gif | Bin 151 -> 1179 bytes html/html/images/forward.gif | Bin 609 -> 1669 bytes html/html/images/info.gif | Bin 1209 -> 1811 bytes html/html/images/list-add.png | Bin 323 -> 932 bytes html/html/images/list-remove.png | Bin 247 -> 651 bytes html/html/images/package-x-generic.png | Bin 540 -> 1666 bytes html/html/images/reload.gif | Bin 108 -> 1859 bytes html/html/images/stock_ok.png | Bin 672 -> 2830 bytes html/html/images/stock_stop.png | Bin 1379 -> 3051 bytes html/html/images/user-trash.png | Bin 655 -> 1562 bytes 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/html/html/images/delete.gif b/html/html/images/delete.gif index 855a9b3c2f26fce99bac3b6dc6d7505ee11d6299..edae2a7f77b189461ab9679f25f9a500df2ad709 100644 GIT binary patch literal 1879 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 I&MBb@0M(2k_5c6? delta 7 OcmZ3&)6c%4pBVrO;{u5Q diff --git a/html/html/images/edit.gif b/html/html/images/edit.gif index c749f465811338334bc05cbc13a6c49dfe6521e3..851d29e64e5565dda9d7f887bde5bdc03e4e0714 100644 GIT binary patch literal 1726 zcmaJ>dmvP46rVgwktA8!wXPxQVP0Y$jMogIMlwndJ?3#^FmuPul}X!<#-p;^u1Yp~ z>oK(wYB!`d^rls2ZKIY%V?;Dop3RiKqiFwFd;YoKckb`^JLi1g`OdQ7KoXf{g|b5B zkD?0C+KqM`eSVf&Sy`!6DpBL+Fk&15vCtH@T zR(9-hn(BQ%>|#jVg}kV0Ht$lSxu=nNhukE@g_xCahFOzb$1%3GWl%}MC-*KEO6^)! z>Vi-x&(_wiuKx1!^4G6>+uOT!y7&G4+JS)~wOY+)$CQ@dKYhBesp(Z)TbEX=YiM|> z(G2wV4yC51^7#q-_a7-JC{?R_2L|5N*SA$wHDqTWeEYUfEh2!YXom9hPd$A2OrfYB9MpDoY0AoOmzUp*jTI^sEqs2GM3Oo@tSc?OnwfbB zhLeMWLRPE@ZD>#_m8$ys7YfD8k&zLtRvR51-`UyI*{M;fRKC8nqN1Yg?Bgm`Pfkuw zdwb95m^qA^u4RM)bQa7)zFs~OA&V0S!T=kL<_V~1O~p+#z~fTUk?sr}Lr4Q-ctOb` zkeM7B!AXwekhy3dZ@^1Jk?@6l5M}`qe!M_Tkx3;zF zm^4TP0`3@`D+lL+13d5;yxUSDk+=jP;P5ysj)27zT=7JT8-aqu0iO(wL=$nhQo`wh zpJE|9Dmn&+g%m6{DJcn)O7THX+Jt#nWU4%6Cl+h3Gb=r3$!$X4u{crpJ?$x~M>3-eS`Km+R zu6o(l`l97|bJJhXo;E6<{Mqn_qW@9v%3x2mfuZ~k`Udd0Q!veK)+ z{&MAVNpaDo!ixnzUpOy6clONb{8J}S96xsSNM7#YpK=amA3U%>>&GAVeg9qN-aWfB z($i99yHcdz?)+v)@^(qmwnSJgN)SQ)wS))+XMpLA+)U@=B zG>i=;&d6xq?yLn{4TKgPQ=6&<;o8i26Eb_M9C=Xq4zRJV#YZit$C(h{+Ocz?hADuoZF;)-!lN@}&$xFpirL1^RaaV9t!L~)PQ~*dWTMDm delta 6 NcmdnT+srtj82|`v0%HIG diff --git a/html/html/images/floppy.gif b/html/html/images/floppy.gif index 7db2f32d1da65f4d4f12af9ee70cef5205620acc..d0562220dc61a9c3e2dc0c88c5111f2a2fb4a5b9 100644 GIT binary patch delta 1043 zcmXYvVN6?P6o%j1UV3jSlu{6GM(tqS0Vds6Ljy$EYyq`D02^0HH8-Rz&18vY*}xVF zS=#{{2vJDDY3!D=;X(`%L1efPb8!v$1DX;^WWkIwFfALI8#Xe;+GG2%m3uo|kM{a5_0_yt9heXNaev2g+A(r-WbbKg zYH~_*Kr{Ho;Oy<$n!1|yw)WVw*w}YttX8vlZ_9Vhm#IwA6|fa02Cm*}II62YQQ>Id zb{_2kc)YZ=rhV9`VBkV@9Sa+&zf3$OL5#ZhaV8FX9Ed~TrbpQ}D6t6Vn_$S|sNdoG z7~lYw1_AgyCaeb0I1M;4h?NKtVjy0w;q@{UP#AV$s4NU30*(=M(RL7Jr$A9~xu9Te z!BeH zgLBifxKBKfb4-F@X$9I46w`1yEv4y1WSN@~&HcM?D~*>r;&uVj^4Ly9LLBp>@LuML zyT`K%=ck5A=MW^KqChHy1t5qQ`TMls4GC|+glC`r`tklfwEb`%UF%m}4O zB~QY5TL!pVun0UCnp=Qoy%O6m02Jzu1V9Sh&dssW{YYw@v4{lHs2xlQ7SY|hp>+e@ z6Q~4_W}OYuQZRPGoG?pVMIz1@-!%lcscFXLL@nXi1q8RZ1Tm}uh0qT}SO@1AXE9HJ z^ucqq=c5n$7S5Q-)5!aeB*Zm9CyvSz4n@a7&>Hjiev>y%J7WuZFW*t>Y{uB!{RK&O zT0PzJ>WC~gsoY5uKUK|{6c)V%EOHJLumK4zWSLSE9+tz=)|o4h%> zlGfZVdG|U=$tT}BnHlz1AMqTPtHb=jp`^`)-gApZ*I92P+0&c()#7`_k+g&AeATK% zrebc^785colz1i+0VtL!MDkM5@iZcB$een$25R z9f%s|q{<3ENl4PYd`DHThos2|_5htv`!7mqi?P#qcrVPWDO*#ZC%;`1@xnackM9@bm? delta 6 NcmbQuIh}FBbN~nI0%QOH diff --git a/html/html/images/forward.gif b/html/html/images/forward.gif index 33d18b57197a951673ace2b3091fd202ba58dd47..fdda6afa9a4212d04374a9b192b026d636ddc29a 100644 GIT binary patch delta 1076 zcmaFJ(#pFbk*PkvC|%#s($Z4jz)0W7NVg~@O}Dr*uOzWTH?LS($xgurC}QQ3TAW;z zSx}OhpQixgCnn{Wme?vODOBX<|Z z5PB_f>IDWZ(4Kmr)h?+;nPsUdZbkXI3Sci=W#V>>8BPPCdQ)&a#vD^`J=7=qK>U%haDv3%LmC5sm=Trhv$+&Qyn&73iP z+SDnNCrzBt-`CsI-PPIA-qzaE+|<}mUsqdGT~%38URGLCTvS+)pO>4Hot2r9o|c-D zoRpXl9~T=F9Tgc79u^uB926Mf@8|2|UGL@T;qK<@;_T$;U~gw@V{K(=VQyw>Vr*n+ zps%N^qphW>p{}N?qO7E-ATK8?BP}Hh9_7Yhw{pm1^;t4nN!M>F}CcTR3rU+lnO4FG$vjFSKW delta 7 OcmZqWeaNyQkqH0`K>~{a diff --git a/html/html/images/info.gif b/html/html/images/info.gif index 94671ef2f88f359a09c7db13d53854a5390ea870..31e680c6c62d7b330c14dffc5f511fa1baeca6bd 100644 GIT binary patch delta 614 zcmV-s0-61}36l=6xdeag>+0#~=jP?)3Q(qoSdppPrqZo0^%JmzI^3 zlai5;kB*Iui;9VehlYiOgMxv8e|~*@dwO|zcXoAjb8>NTZ*G5WY-?(1XlG_+WMg7s zU|(KcTw7XMSXWk6R8vw>P)|-xOiM~hNJmCRL_zCFHW4BMwNxk&g(VVmI=(azettGI8pcUUg$g|^%`7`s!Vo({)k6<- zgeX@T-Q9atR()bG6B%j5Fp^h`4b2LJ0DE) AD*ylh delta 7 OcmbQtx07?jP8I+QrvlLc diff --git a/html/html/images/list-add.png b/html/html/images/list-add.png index 1aa7f095c6c282262390748ab2e596a3fc15c228..012cb2eb40e3d982f5f05811d5c0992c06027307 100644 GIT binary patch delta 621 zcmX@iw1j0ZzRg=VEx>om_l{Mc>YnDlofh?YiI>m3_jgl`P6`OB2(vi4{8HR_@i$jPWU9UC znV!kV&+%p2v+!LMbk=D!G7y~5IA?9q*0+A||FRT(m}6bas;#g}HO8^8DY$J_0YNVZ#7G1WM0L-pqk zwV`?z*U<)qy{@NFK4%PmjQ_uNh#98I5H=Wd!= zdNcjc<&(wx6xukL4(`4wn<>v#@1(P|VBrkeisP1j&pxlvtiN;4=fJA0y-&AZohbh| z@9TGIqm|EPmzbVRG`+mv$Ef&t!Q5DV1_lPz64!{5l*E!$tK_0oAjM#0U}&IgV5n)WoT?=V4`baZe?IFZHLHB6b-rgDVb@NP!081bUc5$CKaf|1Z0IzW^!s?aVkSb zNlAf~zCPHp%(B$v{M_99ykfolqICTnh>~J`_W&P#BRvECoGi8#K>d;+{lWQZCFO}l zsSM@i<$9TU*~Q6;1*sryv)|cB0TrbRLsXR(C8sjD`}zC2>N@A=p;fx9C=B~>pyKR-PuRS)PE{Q~{;y!_l$-DI#{{Q%jmuYsBwJYD@<);T3K0RX=n B{rLa@ delta 7 OcmZ3&ewb;4Ga~>C8v<88=%^6&-|%+~4^;E4F$5T8??j9M9ddFAH8YOn-3iYv{Yp)t(hS zQ=${j&rI&QkyExWI#oR^*SWOInlFIM^4RP?Z@r~|W7fZ~w%NSRk4-IeLgD6*w`C62 zv;Si(oYFUGo4O7Q0|SFRdP`(kYX@0Ff`CLs5jI#Gz>AYv@$fdGBD9K zFt;)=n6^XYCW?;S{FKbJN~jJj8lFF0lM2*e0-{x%A1sz13@CcZ;3g#1OEnZ$E<$4|9vc?6XSZlUfd6?ddtU_RZ_p zxl*$8Wp-9Pd{nG!>TF&eH7lIu`0?W>zkIo1ZxX^8A*Liy!MEnMRefW@jD@+kwN%{~ zo5buoGO5iiH|^KWiQVFQ^BAX0^iVPIHSU;Xz3AeKg4pTphY#mil=0j(2@Enax9NHR zn_)_~>$SJ{`-ucFPH^^seT&6qLc!1q&E=Gk~|Sl!)zeceNLCYHyAQv^H?x?k?|*(D}Cd-o1Nub@%r%pH5FtFO;coPcY~ZXqq)kDr{Yhr;eQZbdL%9 zOS_%4TI*klbl%;anVqdH!87UfQ;t?0pUX#9^z5DHw|uc%URv7e8#g4pG;?mdX|g)3 z3|SPSl{ic7?Ao+yvq=Iz0AROg;FdVg-Rm+!(Q zJW`>dic?Rf{8;qfMDg@710JR{hPx|zwlFarRM?g)yvd2f_k&J+LQYOk=Sh)uua%ZM zX?3oXzOn7Bwf8GSp2JrTJv8{bk?q=ge}PR-Pq-_&Slf$kE;XsQ@1G=e|MLm)Pg88? z7wznc4Ly3>Tl%BTekTXbDNM1~1H391ZQlIZ$wKDemD1SQ>!rRNfj9YAw3aq~s@=cn zPt(8dWpP$E`ztqZ-h7`!fhC0bTJ}HB|LJ-Y{<8c~vxSdwa$ zT$Bo=7>o=I4Rj3*bq(tcLkujf42`V}Omq#*tqcsN?GU+%q9ZpyB{QuOp#xpR^QUW4 zff`IeR`_Hlr{)!>GGvsL6jG;qfAGj6yDXDtt`T6NN lsd_+b^b7RU^YU|3b(6t*^#f$Lz6NS$@O1TaS?83{1OVb)_v!!u delta 7 OcmZqTox`$0h6w-(Ndf)< diff --git a/html/html/images/reload.gif b/html/html/images/reload.gif index a456e7e733e703442d5755520a9d870f670e000d..1b04197ee3410cad48a9b3c8c115a827ddeebbc8 100644 GIT binary patch literal 1859 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 jEO6hKJsd{&36ZD}by~J= zON1z*GBs)`Vv2+!x^bqoN;)f#=bZD$dCv2Bp6~O0p3nRB{k}e*F3moJD-;cAWR2aI zvNonw>==PyWUNd(T`Tdx=}F#mhAYMZd6XO>N5J#>ms|^V?Do~dR>ZC(*M*cHz0u$! zQuy;KUYLGs-WhVe+jO*0T*gv*q$PNeTz=2cW8=k?mQq2>r+mP7(>hA~uVCEPO2tJd;k>X+tTCzYPv`6w98_ z{J(wWFW$ONOxQ2(Yagh5xj(&g@L~{tyDYP-k`KgQA}QfOD$=YL-dLSDps_a2)c$jP z+}YJa*Fq$Q?JGdduQsVXgCWkDFqP%;3J%)`)HU2X8Pl5ERH6Gx>fkcaqE*s&r!Quw zqx0Fm6MaopFCI-Bq2UJM+r;)vdm)uMZUI5mVdgthr8t9wI-UA%Z2{a5m!Nbzm# z+$ZDj$YIN8%HjDB88faV63aFki8cvCpIEWZmL#Bq=4N0O(5P-^t+0RmkAABvBHRBl zW~c?-f(~90m7~_F7Dx_a7w+=GeZ&R2FUqvk+LP)Y?`AU5A+vmj%d%EA8#^? z2shyi3?LWm@qjtUnZ|8|GW-zdO+|IY;hr5|I~2RIit2;wN6PlgUZbpgWB6UNE{Cs|s2BFs-jH2@Z`FC0H3-R5#p#1ene!{R(Bzt>i*vCpd3UiC9uaLiHi^c~|*OJsl!HaSxYeoEzR zga`>6i3Vd7iH=!~&TkowY5t1REg$S{E-V+47)bFs{52YYJK_jWY6;~ScDR`6b)1}+ zM7_q$nCB!)T@~_ZGB>DKfa#sVXNH&>24%fiUJiTtUPCd1rxtmOD(R_@LpRo%b!Riv zOUlwOZe>NI`bS~W`t5q(R$WIKDPiN#A;F}-o#1?)s+?DEG$AcbX0Apc{9ah3Z7w5~ z_dQU!@`QKHpMQKF_|?~{c^;&^pL4D`*^Tq#fEG&K{Oal-8n>(~C9-xymYesi-ede% zt*bU9qUT9?I;jA^*ffn#4rco5D_%k5T@8eHw}vH>^OL{? zwUryJAK6UcV%6Yx^y1CWu+D3i38}H!gxUTh)3skC?od^2y4u@A3y1mUyMtTOP zI+23;X{DsLsH`;ibMLzI(|bshfVOAk9rxtKGynjWafp5#N;ox`Lq&(E4!|4)t-ZG?iBt6n;?w^eHDYgF$1;CrBCxx7 z=!jsf1qQ?-+2P13W`_omF+i9@QFZIX)O>C^9h zqWJg3Y!+zpP-$AE@uQZps=B&xXAFad44=r+wpFW2TFf35?L6`H(_0?N2~VE6Fvh%{ zc|B`uz4F_#J9*}D>&5F2Twhb~;Wp{t@3R`Giuhe-$=tlg#=Esydny;hv{YUB3zJr* z#;spJ(`D~g5hj)mH%?t+%waL$N#6OSJ#yiM<8RB9*SJ+5lRKbiUb>Odk751s-FphZ z{?4Dd?)B-<2?h>YQ}cH6Ik2YetemVCaM}B)_x$>wqQAerJ8a^!YnNHz+R&5FKWonjpXy3^d$fMjZJHWriF_19`mu9`KLbbW!x{J05-0(f!SYuUNdZ68N9mQ zWwX?3$>gm+i$3Q~Sr*US^K8REMn#4#OCNA<-^IYdpjzS@QIcGgnpl#mn*t;lj0_Ac zbqx)54NXIgjI9hztPBlw4a}_!3^saCDuZbNskDOV0%`!MFw!+Ls0ZmVGP5!?h3H_j zj%h^Ek(-~AnN|ta0kpy}#K6)Dh>R>D8iaPYUIc0|0lCR1GdVS{IF%uzq@=(~Umt8) zW?5=-er|4lUa?+&QM!H(L`ku}dw`F=k)A=leohwK3Yd)$%LsVt-LEH3Kn>y`8-w#p zi;`0r-2ME0T@^f&^Yau!GE#F>5B^lk1S(NLD2WdZ@`1T4v8Y5ZJug2u73d Date: Sat, 16 Apr 2011 14:41:28 +0200 Subject: [PATCH 2/8] ntfs-3g: rootfile update. --- config/rootfiles/common/ntfs-3g | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index 2762b8fd7..186e12be2 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -9,6 +9,7 @@ usr/bin/ntfs-3g.probe usr/bin/ntfs-3g.secaudit usr/bin/ntfs-3g.usermap #usr/include/ntfs-3g +#usr/include/ntfs-3g/acls.h #usr/include/ntfs-3g/attrib.h #usr/include/ntfs-3g/attrlist.h #usr/include/ntfs-3g/bitmap.h @@ -41,7 +42,6 @@ usr/bin/ntfs-3g.usermap #usr/include/ntfs-3g/support.h #usr/include/ntfs-3g/types.h #usr/include/ntfs-3g/unistr.h -#usr/include/ntfs-3g/version.h #usr/include/ntfs-3g/volume.h #usr/include/ntfs-3g/xattrs.h #usr/lib/libntfs-3g.a From 9c8fb3f27868d335efb96140242ebd0ffa8585ad Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 16 Apr 2011 14:42:18 +0200 Subject: [PATCH 3/8] core49: added updated icons. --- config/rootfiles/core/49/filelists/icons | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 config/rootfiles/core/49/filelists/icons diff --git a/config/rootfiles/core/49/filelists/icons b/config/rootfiles/core/49/filelists/icons new file mode 100644 index 000000000..52b22e005 --- /dev/null +++ b/config/rootfiles/core/49/filelists/icons @@ -0,0 +1,13 @@ +srv/web/ipfire/html/images/delete.gif +srv/web/ipfire/html/images/document-save.png +srv/web/ipfire/html/images/edit.gif +srv/web/ipfire/html/images/floppy.gif +srv/web/ipfire/html/images/forward.gif +srv/web/ipfire/html/images/info.gif +srv/web/ipfire/html/images/list-add.png +srv/web/ipfire/html/images/list-remove.png +srv/web/ipfire/html/images/package-x-generic.png +srv/web/ipfire/html/images/reload.gif +srv/web/ipfire/html/images/stock_ok.png +srv/web/ipfire/html/images/stock_stop.png +srv/web/ipfire/html/images/user-trash.png From 2909e8b90fc26c53e8f5f0376c5d084b77a4041a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 16 Apr 2011 14:56:06 +0200 Subject: [PATCH 4/8] core49: fix squid initskript path. --- config/rootfiles/core/49/filelists/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 97a2c0029..59f3ebc4e 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,5 +1,5 @@ etc/system-release -etc/init.d/squid +etc/rc.d/init.d/squid var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi From b1e4de058e71db030ec6e0e237fb479b77e8efb6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2011 18:01:03 +0200 Subject: [PATCH 5/8] add initskript to wait until slower drives are present at boot. fixes: #757 --- config/rootfiles/common/initscripts | 2 + config/rootfiles/core/49/filelists/files | 2 + lfs/initscripts | 1 + src/initscripts/init.d/waitdrives | 56 ++++++++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 src/initscripts/init.d/waitdrives diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 73a06a4ba..58bbf8c6a 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -13,6 +13,7 @@ etc/rc.d/init.d/beep #etc/rc.d/init.d/bluetooth etc/rc.d/init.d/checkfs etc/rc.d/init.d/checkfstab +etc/rc.d/init.d/waitdrives #etc/rc.d/init.d/clamav etc/rc.d/init.d/cleanfs #etc/rc.d/init.d/client175 @@ -202,6 +203,7 @@ etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S05modules etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19checkfstab +etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S20swap etc/rc.d/rcsysinit.d/S30checkfs etc/rc.d/rcsysinit.d/S40mountfs diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 59f3ebc4e..4975a5e30 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,5 +1,7 @@ etc/system-release etc/rc.d/init.d/squid +etc/rc.d/init.d/waitdrives +etc/rc.d/rcsysinit.d/S19waitdrives var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/lfs/initscripts b/lfs/initscripts index c4da41389..c32b1693f 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -163,6 +163,7 @@ $(TARGET) : ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev ln -sf ../init.d/checkfstab /etc/rc.d/rcsysinit.d/S19checkfstab + ln -sf ../init.d/waitdrives /etc/rc.d/rcsysinit.d/S19waitdrives ln -sf ../init.d/swap /etc/rc.d/rcsysinit.d/S20swap ln -sf ../init.d/checkfs /etc/rc.d/rcsysinit.d/S30checkfs ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs diff --git a/src/initscripts/init.d/waitdrives b/src/initscripts/init.d/waitdrives new file mode 100644 index 000000000..93ae1ed70 --- /dev/null +++ b/src/initscripts/init.d/waitdrives @@ -0,0 +1,56 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/waitdrives +# +# Description : Wait for drives before fscheck/mount +# +# Authors : Arne Fitzenreiter - arne_f@ipfire.org +# +# Version : 00.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +check_drives () { + drives_ready="1"; + for drive in $drives; do + if [ `blkid | grep $drive | wc -l` == 0 ]; then + drives_ready="0"; + fi + done +} + +case "${1}" in + start) + if [ -e /sbin/mdadm ]; then + boot_mesg "Assemble mdadm managed raid-drives ..." + mdadm --assemble --scan + fi + + drives=`grep "^UUID=" /etc/fstab | cut -f1 | cut -d" " -f1 | cut -d"=" -f2`; + + check_drives; + if [ "$drives_ready" == "0" ]; then + boot_mesg -n "Wait for devices used in fstab " + for (( i=1; i<30; i++)) do + check_drives; + if [ "$drives_ready" == "1" ]; then + break; + fi + boot_mesg -n "." + sleep 1 + done + fi + exit 0; + ;; + *) + echo "Usage: ${0} {start}" + exit 1 + ;; +esac + +# End $rc_base/init.d/waitdrives From e44dfea3bad0ee92e2645bcd3b1082c7d780b39a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2011 18:07:54 +0200 Subject: [PATCH 6/8] extrahd: display also non-partitioned disks. --- html/cgi-bin/extrahd.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 2ea417886..fa12dbed4 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -202,7 +202,7 @@ END foreach $partitionentry (sort @partitions) { @partitionline = split( /\;/, $partitionentry ); - if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && ! ( "$partitionline[0]" eq "$scanline[0]" )) { + if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" == "" )) { $size = int($partitionline[1] / 1024); print < From 33af74ea91c5cf150f13be9bad2a1c8b8ea65cf5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2011 18:09:28 +0200 Subject: [PATCH 7/8] extrahd: add support for mdadm devices. remove wrong devline of some usb-keys. --- src/scripts/scanhd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scripts/scanhd b/src/scripts/scanhd index 2d76ba625..9d47e3d63 100644 --- a/src/scripts/scanhd +++ b/src/scripts/scanhd @@ -2,7 +2,10 @@ case "$1" in ide) - /sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" > /var/ipfire/extrahd/scan + /sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | grep '^"' -v > /var/ipfire/extrahd/scan + if [ -e /dev/md ]; then + echo 'md;"MDADM software-raid";' >> /var/ipfire/extrahd/scan + fi ;; partitions) cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \ From 154fbbe9fccc580792a82d1bb858d6911faa6269 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2011 18:11:31 +0200 Subject: [PATCH 8/8] core49: add extrahd changes to updater. --- config/rootfiles/core/49/filelists/files | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 4975a5e30..8fc42ba29 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -3,6 +3,7 @@ etc/rc.d/init.d/squid etc/rc.d/init.d/waitdrives etc/rc.d/rcsysinit.d/S19waitdrives var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi @@ -11,3 +12,4 @@ var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl var/ipfire/langs/fr.pl +usr/local/bin/scanhd