sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

. Moved sysenv to /bin (as well), used to read some boot parameters

Browse source 
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!)
This commit is contained in:
Ben Gras 2005-05-03 08:58:18 +00:00
parent 4c80170111
commit efa2322895
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
commands/ps/ps
View file

Binary file not shown.

4
commands/ps/ps.c
View file

@ -223,7 +223,7 @@ struct pstat *bufp;
if (bufp->ps_state != S_STATE) return task; if (bufp->ps_state != S_STATE) return task;
blkstr = "?"; blkstr = "?";
if (bufp->ps_recv == MM_PROC_NR) { if (bufp->ps_recv == PM_PROC_NR) {
if (bufp->ps_mflags & PAUSED) if (bufp->ps_mflags & PAUSED)
blkstr = "pause"; blkstr = "pause";
else if (bufp->ps_mflags & WAITING) else if (bufp->ps_mflags & WAITING)
@ -318,7 +318,7 @@ char *argv[];
err("Can't get kernel proc table from /dev/kmem"); err("Can't get kernel proc table from /dev/kmem");
/* Get mm/fs process tables */ /* 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, psinfo.mproc, (char *) ps_mproc,
nr_procs * sizeof(ps_mproc[0])) nr_procs * sizeof(ps_mproc[0]))
!= nr_procs * sizeof(ps_mproc[0])) != nr_procs * sizeof(ps_mproc[0]))

22
commands/scripts/setup.sh
View file

@ -261,7 +261,7 @@ else
fi fi
echo " echo "
Migrating from floppy to disk... Migrating to disk...
" "
mkfs /dev/$usr mkfs /dev/$usr
@ -313,17 +313,17 @@ Copying $fdroot to /dev/$root
mkfs -B 1024 /dev/$root || exit mkfs -B 1024 /dev/$root || exit
mount /dev/$root /mnt || exit mount /dev/$root /mnt || exit
if [ $thisroot = /dev/ram ] if [ -d /boot ]
then 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. # Running from the RAM disk, root image is on a floppy.
mount $fdroot /root || exit mount $fdroot /root || exit
cpdir -v /root /mnt || exit cpdir -v /root /mnt || exit
umount $fdroot || exit umount $fdroot || exit
cpdir -f /dev /mnt/dev # Copy any extra MAKEDEV'd devices 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 fi
# Change /etc/fstab. # Change /etc/fstab.
@ -334,10 +334,6 @@ root=/dev/$root
${swap:+swap=/dev/$swap} ${swap:+swap=/dev/$swap}
usr=/dev/$usr" 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. # National keyboard map.
test -n "$keymap" && cp -p "/usr/lib/keymaps/$keymap.map" /mnt/etc/keymap 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 if [ $cache -eq 0 ]; then cache=; else cache="ramsize=$cache"; fi
# Make bootable. # 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 edparams /dev/$root "rootdev=$root; ramimagedev=$root; $cache; save" || exit
sync
echo " 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 You can type 'boot $primary' to try the newly installed Minix system. See
\"TESTING\" in the usage manual." \"TESTING\" in the usage manual."

4
commands/simple/Makefile
View file

@ -959,6 +959,7 @@ install: \
/usr/bin/sync \ /usr/bin/sync \
/usr/bin/synctree \ /usr/bin/synctree \
/usr/bin/sysenv \ /usr/bin/sysenv \
/bin/sysenv \
/usr/bin/tail \ /usr/bin/tail \
/usr/bin/tar \ /usr/bin/tar \
/usr/bin/tcpd \ /usr/bin/tcpd \
@ -1409,6 +1410,9 @@ install: \
/usr/bin/synctree: synctree /usr/bin/synctree: synctree
install -cs -o bin $? $@ install -cs -o bin $? $@
/bin/sysenv: sysenv
install -cs -o bin $? $@
/usr/bin/sysenv: sysenv /usr/bin/sysenv: sysenv
install -cs -o bin $? $@ install -cs -o bin $? $@