From 7697700802a51ff7eb1216ea29551b73144ab387 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Mon, 27 Jun 2005 11:59:36 +0000 Subject: [PATCH] Made src belong to bin in release cp. Made /usr/include belong to bin in mtree. Fixed compiler warning in fs/pipe.c. Added mdb (minix debugger) manual page. Added ethernet config function in setup script. --- Makefile | 2 +- commands/scripts/setup.sh | 28 ++++++- etc/mtree/minix.tree | 2 +- man/man1/mdb.1 | 154 ++++++++++++++++++++++++++++++++++++++ servers/Makefile | 1 - servers/fs/pipe.c | 1 + tools/release.sh | 1 + 7 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 man/man1/mdb.1 diff --git a/Makefile b/Makefile index e5883aca7..5f099d97d 100755 --- a/Makefile +++ b/Makefile @@ -54,8 +54,8 @@ etcfiles:: all install clean:: cd boot && $(MAKE) $@ + cd man && $(MAKE) $@ # First manpages, then commands test ! -f commands/Makefile || { cd commands && $(MAKE) $@; } cd tools && $(MAKE) $@ cd servers && $(MAKE) $@ - cd man && $(MAKE) $@ diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh index c85456d3b..7b20ade11 100755 --- a/commands/scripts/setup.sh +++ b/commands/scripts/setup.sh @@ -207,6 +207,27 @@ hex2int() echo $i } +# Ask user about networking +echo "" +echo "Minix currently supports the Intel Pro/100 and RealTek 8139 " +echo "Ethernet cards. Please choose: " +echo "" +echo "0. No Ethernet card (no networking)" +echo "1. An Intel Pro/100 Ethernet card is installed" +echo "2. A Realtek 8139 Ethernet card is installed" +echo "3. A different Ethernet card is installed (no networking)" +echo "" +echo "You can always change your mind after the install." +echo "" +echo "Choice? " +read eth +driver="" +inetparams="" +case "$eth" in + 1) driver=FXP; inetparams="servers=inet;" ;; + 2) driver=RTL8139; inetparams="servers=inet;" ;; +esac + # Compute the amount of memory available to Minix. memsize=0 ifs="$IFS" @@ -347,6 +368,11 @@ usr=/dev/$usr" # National keyboard map. test -n "$keymap" && cp -p "/usr/lib/keymaps/$keymap.map" /mnt/etc/keymap +# Set inet.conf to correct driver +if [ -n "$driver" ] +then echo "eth0 $driver 0 { default; };" >/mnt/etc/inet.conf +fi + umount /dev/$root || exit # Unmount the new root. # Compute size of the second level file block cache. @@ -366,7 +392,7 @@ if [ $cache -eq 0 ]; then cache=; else cache="ramsize=$cache"; fi # Make bootable. 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; $inetparams; save" || exit pfile="/usr/src/tools/fdbootparams" echo "Remembering boot parameters in ${pfile}." echo "rootdev=$root; ramimagedev=$root; $cache; save" >$pfile || exit diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree index fd4d63b5c..0ab0e7376 100644 --- a/etc/mtree/minix.tree +++ b/etc/mtree/minix.tree @@ -17,7 +17,7 @@ 755 root operator /usr/etc 755 root operator /usr/home 700 bin other /usr/home/bin -755 root operator /usr/include +755 bin operator /usr/include 755 root operator /usr/lib 755 root operator /usr/lib/advent 755 root operator /usr/lib/cawf diff --git a/man/man1/mdb.1 b/man/man1/mdb.1 new file mode 100644 index 000000000..e7be50ed6 --- /dev/null +++ b/man/man1/mdb.1 @@ -0,0 +1,154 @@ +.TH MDB 1 +.SH NAME +mdb \- Minix debugger +.SH SYNOPSIS +.B mdb +.RB [ \-fc ] +.I file +.br +.B mdb +.BR [-L|-l]log\-file +.I exec-file +.RI [ core\-file ] +.RI [ @command\-file ] +.SH DESCRIPTION +.de SP +.if t .sp 0.4 +.if n .sp +.. +.B mdb +is the Minix debugger. +.SH OPTIONS +Its command line options are: +.TP +.B \-f +Just examine the specified file. +.TP +.B \-c +Examine 'core' file. No exec-file will be supplied. +.TP +.B \-Llog\-file +Log to file only +.TP +.B \-llog\-file +Log to file. +.SP +.IR exec\-file +Unless the -c option has been specified, the exec-file is required. +.SP +.IR core\-file +The core-file is optional. +.SP +If the core-file is supplied, +.B mdb +assumes that the user wishes to examine the core file. +Otherwise +.B mdb +assumes that the user will run the exec-file and trace it. +.SP +.IR @command\-file +.B mdb +executes command from command-file. +.SH OVERVIEW +.br +.B mdb +commands are of the form: +.I [ expression ] +.I command +.SP +.I expression +can be of the form: +.IP +.I address +which defaults to text segment +.IP +address +.I overriden +by +.I T: +for Text segment +or +.I D: +for Data segment +or +.I S: +for Stack segment +.IP +.I symbol +where +.B mdb +does a lookup for the symbol first as a +.I text +symbol and then as a +.I data +symbol. +.SP +.TP +.I command +.SP +The help command is ?. +.SP +For detailed help on a command type: +.I command ?. +.SP +A semi-colon can be used to separate commands on a line. +.SP +.SH MDB COMMANDS +.SP +! Shell escape +.SP +# Set Variable or register +.SP +Tt Current call / Backtrace all +.SP +/nsf Display for n size s with format f +.SP +Xx [n] Disasm / & display reg for n instructions +.SP +Rr a Run / with arguments a +.SP +Cc [n] Continue with current signal / no signal n times +.SP +Ii [n] Single step with / no signal for n instructions +.SP +Mm t n Trace until / Stop when modified t type for n instructions +.SP +k Kill +.SP +Bb Display / Set Break-pt +.SP +Dd Delete all / one break-points +.SP +P Toggle Pagging +.SP +Ll name Log to file name / and to standard output +.SP +Vv Toggle debug flag / Version info +.SP +V Version info +.SP +e [t] List symbols for type t +.SP +y Print segment mappings +.SP +s [n] Dump stack for n words +.SP +z [a] Trace syscalls with address a +.SP +? Help - short help +.SP +@ file Execute commands from file +.SP +Qq Quit / and kill traced process +.SP +.SH "SEE ALSO" +.SP +trace(2). +.SH DIAGNOSTICS + +.SH NOTES + +.SH BUGS + +.SH AUTHOR +Philip Murton and others diff --git a/servers/Makefile b/servers/Makefile index fadeba6a8..45598b4fb 100644 --- a/servers/Makefile +++ b/servers/Makefile @@ -16,7 +16,6 @@ build: all all install depend clean: cd ./pm && $(MAKE) $@ cd ./fs && $(MAKE) $@ - cd ./sm && $(MAKE) $@ cd ./is && $(MAKE) $@ cd ./init && $(MAKE) $@ cd ./inet && $(MAKE) $@ diff --git a/servers/fs/pipe.c b/servers/fs/pipe.c index 6d03d60b8..48e79a9e5 100644 --- a/servers/fs/pipe.c +++ b/servers/fs/pipe.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "dmap.h" #include "file.h" #include "fproc.h" diff --git a/tools/release.sh b/tools/release.sh index 55a172c09..f7b2e7595 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -47,6 +47,7 @@ mkdir -p $RELEASEDIR/tmp mkdir -p $RELEASEDIR/usr/tmp echo " * Transfering $COPYITEMS to $RELEASEDIR" ( cd / && tar cf - $COPYITEMS ) | ( cd $RELEASEDIR && tar xf - ) || exit 1 +chown -R bin $RELEASEDIR/usr/src date >$RELEASEDIR/CD ( cd $RELEASEDIR && find . -name CVS | xargs rm -rf ) echo " * Chroot build" -- 2.44.0