From efa2322895c6e1a5e1062c219e8bea9359ea584c Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Tue, 3 May 2005 08:58:18 +0000 Subject: [PATCH] . Moved sysenv to /bin (as well), used to read some boot parameters in /etc/rc before /usr is mounted . fixed ps.c compile breakage (MM_PROC_NR rename) . made setup.sh a little less floppy-centric (cosmetic) . removed ps binary from cvs (whoops!) --- commands/ps/ps | Bin 16540 -> 0 bytes commands/ps/ps.c | 4 ++-- commands/scripts/setup.sh | 22 ++++++++++------------ commands/simple/Makefile | 4 ++++ 4 files changed, 16 insertions(+), 14 deletions(-) delete mode 100755 commands/ps/ps diff --git a/commands/ps/ps b/commands/ps/ps deleted file mode 100755 index db6d79b4c881dca0a667e348dbdf13b84bd6f9a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16540 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 #hd?Q3GY*Rw&iE zh`D=c6m2y9cX)78r{V%)JOBHzQi6J1eSnBidl*UC!$3q@+m1(XNlj+ipgc-Gomq(r z_F0yZP@x1bvk(;zRc56>~@d8($opx3Eg$jl@ujAeB45O@6Q;#B8lra*<4kv0sa&m-XSydixG zHB-Kv`F^FDxg~Y6AhSAku`qL6>Y^iaYwDsivm|xVlUdY#kzu|W3OgMO`q3x^a^F1q?PhuU%OvqjwI3 zO4AD&!BCmSr+`^;(X3Gjgo(56PNM*0CkQ4XgeYRzDTBJPtayP4ku!Hsj!2>4GZL-SFr^d0667k@qVYaJT{$1fx}?=!rp@ZeAcX@4g2LY^NjN=))@9 zghGfaai!jj89-3FWf6x_svRi*S!+GbiRTMl2tgU`{-ih$spE3n6$gc$5(Ew zz;`*-c?GLC!N(#_?qlCX-Q0zA>9Vj{+++-y@(@m`c3{8>H8a<0J7N4cbDua%C!3!|V&ii7u&^6D=-J=*n^ zpK9;nB{L;puFQLt1GvEayUF*0Jnx`aW`o6a|9fyH=;@?crd@ac^jz9U!O@QoT?*|t zUt8>!F2#NAoX2injppuV=TU^j?%hrv@rlgg?jd(h9q}Ln^`O@M1)V_D`^_p3p2kzi zis{Ppjxd?C;rIlJlUC!w>9{nt+v!N-PKTkgo!&(OVX%Z^Zl+pbUrOh&O9&eq*>0!P zLgi9#RGlEf7?~15O6j1#ocB50$HL&QUGMdo^db)ahWB2WhO+EnA%b3;!)X40d|wiQ zem0m(Vrd_Ml^rbTlT9ySJqG^J`35vHB@gQ+GzcxaQ4{jGj~(M<=A1KSmMOE4s^SIZ z0(Z}E(Wx)MRxJ`&fB7E~?3ZI-F4zx2k1WJ&^N?U4Vvm4eNFaK8(J?9iQ5wcyzKU{V zWXL#{Er4QD=L(=3%B0*+J_HO~9kba=q>51Dd3#>87X(h(k51pR$oZmnN5A}Nl4mg>BI{K>Y^74)miQrFBG0l7k>7< z`^4G8x6_|BKR@RepPhgVbfo(CK4rGq_k`R0>_j$`fkq~OHh+HBsu;+A`VV{HhA!>x zPyazJ*tGIZ?QNXy0-v4uvBiqx_xwVcM<BCa6+<*1PimTXb za|b!#R19cug73;Vzw@Sesr}grI%S9-_|XxPaJoJ(02)TshE`q(SO-D$Bd1Ay5=>pc zIa$W55-ADd*k_LL3HZBs^Y+@m!I2tpEcus@Q6U7-<1UGgD|DV|#-I%il^?*8o_bxo z3mH^c9UK)W9r>zt zxOat}^~<_w;8%aoX{>Wz?kowu){PE7P&pv^$q@_FlD(YLX{RMq&oy;zrI|9zJC~={ z|I>N|9-M>BwY+Bh66Qo92)jC7Wtrx-%q8RyX$d|{VN03AJ-18skUyZ2-(MEm9^K_W z*2pK%uhKYyTZ9*NhVbMO;lsGlR!7Jy=ZHDo5LEsb*l@~1Wd=o3B!wbc;f2m$+kFoH znFYlVj#|J`O^zzuIV))BKy{SfZ#4k*21kAp6Qzhn(^c~v`A)hS60w8cMbSngPYCg` zRaX15{8E%6vj~LbYOn-<<+aoo<(;>u*1sZjyF@SNweihdW6CUZEr*RDxHi;e-sT5p zecq}qj{CMa54+A@Ei8Clf7I3U0p9HY8h>Z@+8W zk$O#k)RBjU^bT0sui>MH8+8Lg9KZAfFl#(3Klsj)mvQv!`9LZ5n!kSdb+7STOq}E7 z|9JpFV~nvC%abdmF^o`yu2zYEx!we{^Oj{c2`VV z-iYQViFa4g6J;$*WyMtdE{_)yiA^H&8?EY{%{$^~8TmFnXIJ z9SA8>GZdPLHA+fwe@jSePQ+TJJDWmnceaLFr{J}=elQc#;~Z*!40tT~0N6C>lE)l|qR`j6TNl;WJYDk&E1cI>GtR`vBWz zcT7sEjbW)V7LA4)l}HRmzo{h=3O02}$*`(4fidv{UOo!JYT`gBsz^;iC5ROWB>`Zp zFKOJ8<1HzXR=7q?4Nbl}I#56Of{C zD9iw^2FpR;=3tZ5l-C~={Mg=@+R`NL=N?Zut+6H;S}Y+&VvP!%Y)4B==m5NugS-Rw z7ilDxn7<;0qA~SASlX{PH-{2QsU_5`upQC1U`wP)iU%7H!HAQQZ->~{2*QE_o8pp% zTH{IwtD!}=g^jevTSBeSAD;^8mSjpw!M0$eMNFawF@>9$q{OH@dH^vYl#Hnf1eqo* z7g2y97HQ&4(5JR20y&5^A(?jtm9PXrrJ(?CPQ(s{q7n~r_2AkXjCM#Zk?0}#V=Y*& ziA7sFq-Gj9*^yMZ-`P4zhC&o3N!BFhiXeyCOHjV0A}%i%Rg7LAYKKb`tNm&c&PDnQ zN=ipObT|=FLS(iqCj-S^j+|tI4-Wycwon4$`EX9hc~fCKpe?D%R=~S=%buJS6ftV-48X%?V(08#nvF~&+_+8 zi36Ad_Lxc2;OjCuUkOHSO9{Kab5D+T2aGO}P~$K?YmueKU`tDmp28)3F9&m3z->~q zLe~frd=X`mNvdFv{|TdG6_ZfrqrMT(op?qUGlmqDJ&dv!_5FCR$CGrq8_$UK#Fort zz_jNQo@%wzo=5PuC1Q`10Ix%RDV`hfT!rUdcv2E^2c8vpZpO1(!dFA6)7kQtKgGU@ z=S)0lFI|A=11R*OM@IS0*T5go0X#|0Rd|w|^lZfQf8t5rUlizgxowXl9fxaa{X z9s|ht-IsSWv7dm>{?R{kq57R6rSVQ|P1r&Cml<|HJ(0@Z@S`?bv*|x-+dQpt42wvI zdipmT{~5o>_F(UrwvW|g1KW533MFBq4$z?tpuC9kG|CewVU**T z`&TLTz+I0bp}0^OiUDJM3#A|B1r)jy=|Tyk)T69NS&gy?#euQ~WcHf5QQsdrfQ$$g z{EDz@I|6IhQk_0%ba42tbp+Fg))q`48`>%0K!Dsl$(*xj%?nuo><*)Us|^SC#}p;j zO5ep1eITI3$ad-DJpqe-j6NjeFjB($O`92g-9z#O6s5Td`1FMjhp|hxAfD076%HfC z!&Vde1Ww1tKODw3z}R=@T5uAUA2=L-b_)Esx@n%(4}M_JKi}cwE1VtwAjpETJ+$%9 zf;fyVkCHn2P=mvuk1GjA-}rEtgh2y+Wy4{j227u;5L_qk-b&-q8WaFVA}jCk%cu!> z^Pc+c)Q_d&{kt~@I0?lR!UxPrFdYupHPrcKEb1*bT)SnfTvyLyBjN9o>*_XbllfPb z1P81nkL*pXcO@tpqqmY=-UHYm0Ka&%rJq=U#|+bkn_>alX^mS&zZ!2j97{B@6<@bu z4zj8oyuX9iW4#48#iD>1yFUjXjvfvsnq&)(#wgO_-w{|a9fN|{@1Duw3;GwQ;g4A` z>{&sIz^Wz%@go`Y(w0>%KUBxl9!+_q7MY9Kh7wA3OK~aBmbfC0>}eMnp@xxoImFli_$lW)E|mAae0^BZuRrg z8T(fl2*+3GJOE#|9EnC0P|!b>;Qe&|L4>$$!vbVi zY&fYTD8K3VSn{?aT*VsM8EZZ6XiV;3i}?+$wE8hWHG+t<$bz98B6w@I1%qEB6nM(+ z4+N4*Qz$|EmsoEssL~N?g2QrsTW0{LjSpd>FgW@Mi{pzEJFB}ODGs+bpOxiBl?xAw*D;#n6Tw(PJ}1`T*BtV#}6d;Ck`?8C$_$@ zevO#l4|3!2Zg$1iPXG!FHYyHVeuA-uJT(b-BmvrsxaS zTtBw3mvZ_Q`u;0h9-;qex7{BQ3cZZ8uaI9TP|3l~jZqx>%5!jIOAI$WV>x=9Z;_Gr zTJwYb1=m6!Cv5w}`qTcF&CMUVT2nOWy2&1oCY%V-M`)J*ppT}eb(8at9B2x)gz{k| z+b8njNV4_i98C5biBcYBtsmf+N;#PYM`B3)=x$EHO|f_)s{9zaGao-0m3j^7no1bvNa1Is@bSwu8gM29m3xid#Kjrk12r0Kt!q7Kz z`<%X_`vX{l2XipOXDHJ4SPn)%9kVSM#C*S?ypqS8fH2Sn*l(=ylti>K_}Emq_4rgc zJ}?Dt30<9pBL@z)#*NAOL=GU{J$9STzZuaEHx@ZK5}-Zth2>Vi5>w-G9GPio`SP)>1(9 diff --git a/commands/ps/ps.c b/commands/ps/ps.c index e8a6bd27c..826eddcf6 100644 --- a/commands/ps/ps.c +++ b/commands/ps/ps.c @@ -223,7 +223,7 @@ struct pstat *bufp; if (bufp->ps_state != S_STATE) return task; blkstr = "?"; - if (bufp->ps_recv == MM_PROC_NR) { + if (bufp->ps_recv == PM_PROC_NR) { if (bufp->ps_mflags & PAUSED) blkstr = "pause"; else if (bufp->ps_mflags & WAITING) @@ -318,7 +318,7 @@ char *argv[]; err("Can't get kernel proc table from /dev/kmem"); /* Get mm/fs process tables */ - if (addrread(memfd, ps_proc[nr_tasks + MM_PROC_NR].p_memmap[D].mem_phys, + if (addrread(memfd, ps_proc[nr_tasks + PM_PROC_NR].p_memmap[D].mem_phys, psinfo.mproc, (char *) ps_mproc, nr_procs * sizeof(ps_mproc[0])) != nr_procs * sizeof(ps_mproc[0])) diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh index 3687c3db1..ed244fb43 100755 --- a/commands/scripts/setup.sh +++ b/commands/scripts/setup.sh @@ -261,7 +261,7 @@ else fi echo " -Migrating from floppy to disk... +Migrating to disk... " mkfs /dev/$usr @@ -313,17 +313,17 @@ Copying $fdroot to /dev/$root mkfs -B 1024 /dev/$root || exit mount /dev/$root /mnt || exit -if [ $thisroot = /dev/ram ] +if [ -d /boot ] then + # Running from the floppy itself (or installation CD). + cpdir -vx / /mnt || exit + chmod 555 /mnt/usr +else # Running from the RAM disk, root image is on a floppy. mount $fdroot /root || exit cpdir -v /root /mnt || exit umount $fdroot || exit cpdir -f /dev /mnt/dev # Copy any extra MAKEDEV'd devices -else - # Running from the floppy itself. - cpdir -vx / /mnt || exit - chmod 555 /mnt/usr fi # Change /etc/fstab. @@ -334,10 +334,6 @@ root=/dev/$root ${swap:+swap=/dev/$swap} usr=/dev/$usr" - # How to install further? -echo >/mnt/etc/issue "\ -Login as root and run 'setup /usr' to install floppy sets." - # National keyboard map. test -n "$keymap" && cp -p "/usr/lib/keymaps/$keymap.map" /mnt/etc/keymap @@ -359,10 +355,12 @@ echo "Second level file system block cache set to $cache kb." if [ $cache -eq 0 ]; then cache=; else cache="ramsize=$cache"; fi # Make bootable. -installboot -d /dev/$root /usr/mdec/bootblock /boot >/dev/null || exit +installboot -d /dev/$root /usr/mdec/bootblock /boot/boot >/dev/null || exit edparams /dev/$root "rootdev=$root; ramimagedev=$root; $cache; save" || exit +sync echo " -Please insert the installation ROOT floppy and type 'halt' to exit Minix. +Please type 'halt' to exit Minix. You can type 'boot $primary' to try the newly installed Minix system. See \"TESTING\" in the usage manual." + diff --git a/commands/simple/Makefile b/commands/simple/Makefile index 92bb2430a..ea146f260 100755 --- a/commands/simple/Makefile +++ b/commands/simple/Makefile @@ -959,6 +959,7 @@ install: \ /usr/bin/sync \ /usr/bin/synctree \ /usr/bin/sysenv \ + /bin/sysenv \ /usr/bin/tail \ /usr/bin/tar \ /usr/bin/tcpd \ @@ -1409,6 +1410,9 @@ install: \ /usr/bin/synctree: synctree install -cs -o bin $? $@ +/bin/sysenv: sysenv + install -cs -o bin $? $@ + /usr/bin/sysenv: sysenv install -cs -o bin $? $@