From 73ce6f1b5f12690d1776e6bf58868d215fe60748 Mon Sep 17 00:00:00 2001 From: freesource Date: Mon, 24 Feb 2003 05:14:48 +0000 Subject: [PATCH] It was a very simple problem afterall, again BEGIN statements the causation because expect_uml was looking in the normal places rather than . when testing under rh8. The stock agetty works. Ready to go. --- expect_uml | 28 +++++++++++++++--- .../src/linux-um/drivers/mtd/devices/blkmtd.o | Bin 14296 -> 13360 bytes .../src/linux-um/drivers/mtd/devices/mtdram.o | Bin 2900 -> 2900 bytes 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/expect_uml b/expect_uml index d31a38b..280623c 100755 --- a/expect_uml +++ b/expect_uml @@ -30,6 +30,7 @@ BEGIN { if ($fhs == 0) { unshift(@INC,"/usr/share/perl5"); + unshift(@INC,"."); # better make sure we mean . when we mean . } @@ -43,8 +44,20 @@ BEGIN { $ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'}; } -} + my $pwd = `pwd`; chomp $pwd; + + my $tools = grep(/$pwd\/user-mode-linux\/usr\/bin/,$ENV{'PATH'}); + if ($tools == 0) { + $ENV{'PATH'} = "$pwd/user-mode-linux/usr/bin:" . $ENV{'PATH'}; + } + + $tools = grep(/$pwd\/user-mode-linux\/usr\/lib\/uml/,$ENV{'PATH'}); + if ($tools == 0) { + $ENV{'PATH'} = "$pwd/user-mode-linux/usr/lib\/uml:" . $ENV{'PATH'}; + } + +} use BootRoot::UML; use File::Basename; @@ -91,7 +104,7 @@ my $uml = login => "root", password_prompt => "Password: ", password => "", - prompt => "init-.*# ", + prompt => ".*# ", halt => "exit" ); @@ -171,7 +184,14 @@ elsif ( $filesystem =~ /^mkfs\.jffs/ ) { $uml->command("umount /mnt1; umount /mnt2"); # Fall through -$uml->close_no_init(); +my $close = $uml->close_no_init(); # Wait until the last line -system "uml_mconsole $umid halt"; +if ( $close ) { + system "uml_mconsole $umid halt"; +} +else { + + print "ERROR: problem shutting down, contact freesource@users.sourceforge.net if problem persists\n"; + +} diff --git a/yard/replacements/usr/src/linux-um/drivers/mtd/devices/blkmtd.o b/yard/replacements/usr/src/linux-um/drivers/mtd/devices/blkmtd.o index ec1b42e2d28825f4bfeb745694a8aa502e847b58..de40f2908eedfc8bd26fad937af18a342b397676 100644 GIT binary patch delta 5434 zcmZvg4OmoF8pq#z89p7EfkhY;b;K(TI<|~oKx!fmW+p9PV~U@TTP-EK84kuG?T8~= zx4V>fvyaEtwOxH4TdJ+FLVPk5RK1)Q~ zc8!VN4r;@#_}lq7ET1G4mn~J>L*|<^53kQlJ>~zEmAna>$E;O4_mhdJp&viJbzOlol_>fA1o{-qQzZ|K)ANg2blC3MQU zUi)HFERjA(cKAGI)wpLuaYppkh{(lN;A822;a@EmhwNLK|$sg7bO2o-*_3zW& zrnH0vf6K*^rh$1}O_-_kb(!>MOk*a!5(j%tQ~CVr*-kw1uXp5rp16^--Qd6Ytm&N%i$NOcx~SpxzT^llJJ5;Zx-97=3p5LsO4nQ0=?uPW~#Th{_Xz)nuvZVmDu7 zIi0(?2Z9g{$4NgK?uc6ptE*dcE6X$8%4$pPi|DV9OdLJ28SAV$T|VF6EtT1~YDJ1w zGyTz6i+FY&4qaIfIyQH#-A8-vA zg{PTzTIwonKp?fIodenLlGdM9``~$TpvA2eVf7JRMK?_dEaMsnR)nT(#oCpL{#{e0 zvT+|ELQyogCK%-S>zh6h4czLtnJ37o@iQ{GJgfRDAMg#Kjf`5; zl-Y(1H)QH}T9x9)+Ok42Le@LgzvA@w`t}5lJ|KCe-LAe=c#*9A*pJ+sbJTQOYBDg5 zs|hD}g})^Uhu8m&({tbALUyNl;kF7JQmQP{vMR7Q&VgzIZ3v3cEw7aycn_WaN*j4c z8^!8lTS?PESPf?}O=k>t5+j`2f;iXd%xgYtxheC)V^IzN=Eh67(A6IGs?^~>PMN2C zVdcX!+cre9U+v+z)bG{r)GLr-CXe1_bYbZJ2cvH7bxV7;Gnn`aE>C?jzb-02?n&; z$!p@oA+VAjbU+Bop)>N$`ga=jUmn%K2d6U)akQeajr;^WZ`2kk&is-jPLo$jTdcO- zIzG4RWCLH3@a+gVhEuh@^DE33g1ci8rtFk4x(EqTdWY^VT9eeof#pl6aLwmc^3-^& z+JR`+p+LQB#l472->szO;m@E$9JuBzTgGyD8v{p}C+ppV>1>Aoq-}hFZK6CajcaWo z?7kXjf)kD2dDUV3lv}>TU*+Sht;HnHyg=MVN*d1lpg9rWY(5?vqSfZk!$^&|WpIOF zKKrd`?f)CC4YMVwrl;p(<8APoCs~m@<05esaIW%w=rL_Enik}Byl@E@3nH}RB46Pz z#U__cI>47oAR_}2YNlwhbJ9?z;XA?}}G(1a1~rQ&%DC0FKl0N(ftRoZ188 zu=Zm)UWH%kGxB@D4`|_6b@cm2vA+t%Z&PfVUY)o?-X-g25^Z6j4SwYJ*^!6Mk>B?B8!75^ zUe=F|+$&F;QC~5tB~0!~(CB2^|yiDHvLop^7s_F z$)-;PXp~+6oEoE70#Rf2-;YlTD;Y=B6RIB@pB%R2Hlj9@9<9XJn-!BJZ1n?W6Re2AUhBR|n~z2kG@ex+X|(3(_wQ(fWKxtZ&~C6VbsS-3rZ@C6{3g zh0?L0_J0QHZ-exWAZ=zx;s-hM(Ws#YN`Y3;fz3Q&Djw{EvO$io`H#jIx%tznIYl?wYh!D_)@gYqn*=Y`(EdN$E6)+X%JTgF4+-y!U%7Qf7X z{BlGoxIb7s1zm#ag0lqYG2!cOp??N)#9ro|xKWvNh_-V(`n|;T;o%KosOJt?X^YTD zS!WUbgNc-WDeUJ2U&g-5*=T3ZBl?2rCc4bT#9`qeCbls#@l<9G(Mpg5x*zoMN;b0r ze1bb5rOyk!gEbbki#Z>+ps*icjfEX%4M!gdelK`UkZ{v-d!%5rV4PrK1kR~+7tsK!^ov683TPj_$_Aw94bkBp)`$69aUR9ly;)ku|a%ThYtJg0W^&WFj_E0FrA6&ohx{c zphs{!$P?~h4L{9-eN1F_L_AnbG!B%P5v8+6zkA~e=N}!4xd9GViH0iH^HA+fH_=nV z{-)qNY{yM@fHlVdS@5XfCxRygPYQk|cwVqO9{bM@E(inR+mRy;1?A=V_G68dB?&s1 zNbzK$rwFElyk+xQBeG)Fd@6)46S`7pjWtfu3pv8@vgoi|=(mJ^Pv~aBV{FIi_<}i? N=sfcteP{X|{{=P;1Z4mK delta 6407 zcmb7I4OCQR8h-EP#}TLQh=8M#0^SJ3j1f#wEPn>I6c-f~l@v`4-IBB!wbmMOVC{Ni z#l5*{XEi%%sc74ZYm}=CilS!eYP(@p>t?4wv^0$5$ktuFf+_W)Mf{657i!Li~FShAfR(*(lv&Ci64mCO?qVg)Jp|>iPL+w=% z5I?*cfrrv+rKCS3`W-f~#vXVqTe#|2XOFV%3Itkx&~R(|KE?YLNaDxZN$+zua%FmJ zuduaUL%Zn_rO=R`X-!(T0S|MkU(@@%Thk)foUsNi+XzW^!!@7J=dHDAbyaxqy+gr7 zmn)iFY$OXthO`>d4&AWf`B@{pZFsOAyhhoTjh(CEf^O{lxorpiZa1}6qGG5WL6?`g z;>irqQQa6UBYE&4+M%^ZrqogX=(>?7rP;P~eKN0=l}Cr8BDpQbIw`@EWz{V2Sm9gG zv?PtRpd9)FtM={5&v$cuPoC8WTT825Vd)3mp?a1@pJa1XD{mjuvaY1pKWo*qTC|Ab zp@Y-wm!OaqeJHPe4An>&)ZeIEF;KBmSe4YW=po7 zdu3c%*0r(5WcgmtOmA%qGWR`cEnJF7Tf6gbysdjG*MgZU~~Vx-}?AHHN0~FQO@WWh=!z;$0s8ss#Ko!zkMsZyXJZm3CBq9dt>O z_84bE?9xW#hmgMVvz?54L+7N#v&&srPu?YJ4!OGk3P>q^2-d33A>Ou05sGBVI2@V~ z@gDS!)4Eg5Pj{*XN?9{37+a&Fle7cKr1XM&xVK4K5L2$_s5U+LWiuM_>^R}?Lz6MO zT^G+p7($pFf!5$x)Lv0`WwsrZhT9K(9XB*bEr6r{_n^e{0o{Z=Y+CO%!v^N7`N|7n zNZTy2eg}t@e#kw+*w!vrDmNs{WEmyRw>bL8VYGbxSYJp;!JnX0%{e$&wKaA?Rkdb> zYQo}?=HUXQ-~IYm_ZNRgLua-8@`J z#HDIZHCoG8?Wk!aHYHp^bi%T&F&&mlPrKYa=T5bEHvXh}tE2t*kamz;(X5p0h98tj z*)_basuyopRS)hkbKK2~>~aNM#%Qk9e9HIPwm9X97maG8(|ZSuIegy)gj4F|6J ze299ao{wN^V@j*tlX)28_nJ4ea~&xaPug{$DB3z|8wu&Df5B)j6w}Nsb5K7^Q?8KV z^dLW2_rZ}_>81hYY`W)O)IrQK8*X)Qlih|k8;BKVjnc5Yjcs8MM!wjW8&Gr3ilicx zlJ>BqHUGZDU1kG{|6|9Et}Ooq=JibbX31r3v%~#?$l^|fsBkIvnfW+Qh&is}K(VOt zl^e0;s~N>t`KntOvYVkSIAxGY+nF@+GE9l#_h1)}#O?ZI)0e1Dq%=5afOJqhRnsV6 z-qgHbcFD5=l1tj?XikJzsVf?1_l;H~+Tz23j=)L(;kwV~sK!P0h_^O+KW-QA`Hb9& z6UN_z8fT-0`TF3+=w=2=pUNRQEDmqbJm@q+eXvL3d%_)QF^fQ=0=bdCImU)|wx< zBWc=kyj_uFPGTKToiSfx&Y$x!NPH=$ZzrbO1b=ToPXSErl1cpe%ShXDLn-YQX2I+8tKK zXVAQ@9T!Y{9;IX}mjg?(3;D9SWEK7aG~ar2?>t#vVzm2$Acr50#Wn1nPlb*1D@ zf7F~ldYqt?tb@S(pujiEPbX1&S}7?)b#985XH~m>xZ+0PSaIiaXwh3TwR*D(=37*$ z7-r|_ik<3AJ{BBraVS4waubx&LOxO4B&B49KXQM)J-=LVW%+5WzA4`SHC)7)j1y%R z*Qq97-n7}QEv^BSHizTinu#?99!Y}rxs;2QsT0t5C*O#9;~M%k<0?ewV@glEr+6<& z3zBy8CFpg8y2nZhFXn%MZ>jBn*ow-R-|) z9cBTZPRmH{X76Cnip-$ISUpd34HcNb}aOE4@lw3u; zlc#uV)669nTX(6uagWU*{a884Hc66xXH<4PCGD&%3m-2@1;)QSsnSs+G-AAzXH1UR zE^Rd|kwr0U+T%^P^hKm>#plPmrEBoy!dta&=}tT??r6LeIZkRY&P6`o@j;B#t9Toe zcd;GUQleydqvE9`{!lSWtKmapzKu%{yF2VL&)+|>w%lxL+o$TJ6&oO&Q}YX-%Z;;9 zkHl?86U5oO0?Sn^!Oes0YFFjOv({`Bblzuu`n=C)E^EB@z0t?MSx)I!S#PfmmCL&t z>wCn7w)7#|Y%vb@h?CEBHO}>jmpAk`!eioPXE$SjA7%gwx*00~8}2f80G^38J_c-! zHRRa%P>V`r3pM)0#)aB@5q%nL%!`exd^|Q-l3xfi7Q{^s;aH~|e~(L=v7{@KGk+vX zLba^zh+e=X$oK$~0nWvC3C^G2xa6~dtj`5<;U!d<`3&&I9f|h99`kwNY2n7yp4}sz zorop~@p_2=2!5t=RnN|n=L1-8{lTH6`T+h#0KXK#uLW=ma%=rzd*J~*=2q^Z;Liu}mv7<5>vxBH-n>ObWFBad1m|!#Kz}lTe*(_02p;v06hdbM z^p^v85HA!zuTr=&z6UtY|Q zGo}z-0?PO#6p5q3ydRMH7{MPGd=(?UAiU0U^pw9@vz`4czn|zs=64dEV&0c%JpzC| z5B&`fZ15^$e>lQsIgO|fkT;|-$A%Hi5kMhxtY5Y$OAEa z2tv*v>cxma(t*5==R)p_{!V8BHqBrW zBk+j8b@(dGas}<-1n&nj&tPQZLxf<2z|jK7Ga|4_f-eGc#wCn{iB>ZX!F;eD>$V8o zD{w#S5$K14pJG0g=qpB4_#2>yH-0A;Y{LyJJF$QnDO_&?|61<3mJ;7%>Cyw@3eZxDvzsf<8dzrHrV=A;yP^&H_2Zpbp^3 z@Cim#WHBQu@>@n!WUatsLjI}Xv+-_{FyM=U@+hoh98FZ=VFe<2iv@7Z|94`8*H{jR z(Rhim!#qaFxARL48SG%hzPDM9eXrn|1AY(4jy`1$N8d9dFa_TU*xr3Ww)ZL{67&33 zC_WL2tBlAj9d{uc8U|q- z>Tg&+2>rh<1VP~tp!XI=^u9Zg7xrY1-e)j}fqa2QLhoWd_B}25GJ)lcSihF_V{qXJ zzJvL%@V_IIqyI-(fDBHE1)mH4wcwWpzbd$;lYhMp$PT(NN5#4eem8SerVn$pDuof1 zNn?3mq60#HoY4ctKZK%z1=&O`jAMyHB7ozFA_R69*h^rFz%)iwDw`1wbAj@BqF)RC zBqRL1Ech#eZv=WcqCeq5&cW~qJP%|;ml(0JeWV||G3FA*GvYJTD8`9IPch~ZU1!Al zpeTQ)ag0vP29PWDDDz2}CBc_O@%f)jv{DG}?2LtQ+!M$f6PaVWyB5oA0hAB1$I&}3qU?aV>~Q?!|^P@RXT||96l=WF@aAAoG);Z zz+!==0(F5a1+HgAg0BJPsYGuwM+M&%=sCm>DEa$Ba6;fmK%R{+nIpg-nd6km_*Bk3 u9LT(@;7QDJtojR{A@okc#|l1C@JIdFndY$q$K_eZVMNOrvyA4H0sjRxen4;l diff --git a/yard/replacements/usr/src/linux-um/drivers/mtd/devices/mtdram.o b/yard/replacements/usr/src/linux-um/drivers/mtd/devices/mtdram.o index 756a94c17d079cd839f8d643637300b10187f6dc..cca30f138eaac097de50993894a75136090ff9ee 100644 GIT binary patch delta 15 Xcmca2c13K%G-f6fv&}P@_pk#1F)0O` delta 15 Xcmca2c13K%G-f7a)6FxO_pk#1F&qV%