config version bumped to 307; NOT cvs tagged yet; misc fixes

diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree
index aeb39b7f011088167d11226b0bc60d577b4db6b3..a9b43f31ff5789d907426fd3f6a58ae1a575f821 100644 (file)
--- a/etc/mtree/minix.tree
+++ b/etc/mtree/minix.tree
@@ -30,8 +30,6 @@
 755 root    operator /usr/lib/keymaps
 755 root    operator /usr/lib/m2
 755 root    operator /usr/sbin
-755 root    operator /usr/sbin/drivers
-755 root    operator /usr/sbin/servers
 775 bin     operator /usr/local
 775 bin     operator /usr/local/bin
 775 bin     operator /usr/local/include

diff --git a/include/minix/config.h b/include/minix/config.h
index 14d545c7cb0583b13b20563f7b012e2a8f8e6d74..eb566deb775b078078dfff7b9932093698952a03 100755 (executable)
--- a/include/minix/config.h
+++ b/include/minix/config.h
@@ -3,7 +3,7 @@
 
 /* Minix release and version numbers. */
 #define OS_RELEASE "3"
-#define OS_VERSION "0.6"
+#define OS_VERSION "0.7"
 
 
 /* This file sets configuration parameters for the MINIX kernel, FS, and PM.

diff --git a/test/Makefile b/test/Makefile
index e9b8db6997dab5e54e6ed7a26b3519ae2b348f24..3cd5bdd8010c198176250994ebc5e098209bf99d 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -28,6 +28,7 @@ $(ROOTOBJ):
        @rm a.out
 
 clean: 
+       cd select && make clean
        rm -rf *.o *.s *.bak test? test?? t10a t11a t11b DIR*
 
 test1: test1.c

diff --git a/test/select/test14.c b/test/select/test14.c
index e4870fd5166c1b9a96c578825497f1f66fa56311..07de7c7601296d93a652f605c0d2700d0e77d4e5 100644 (file)
--- a/test/select/test14.c
+++ b/test/select/test14.c
@@ -55,7 +55,7 @@ void do_child(int pty_fds[])
                FD_SET(pty_fds[CHILDFD], &fds_exception);
                timeout.tv_sec = 5;
                timeout.tv_usec = 0;
-               retval = select(pty_fds[CHILDFD]+1,  &fds_read, NULL, &fds_exception, &timeout);
+               retval = select(pty_fds[CHILDFD]+2,  &fds_read, NULL, &fds_exception, &timeout);
                if (retval == -1) {
                        perror("select");
                        fprintf(stderr, "child: Error in select\n");
@@ -102,7 +102,7 @@ void do_parent(int pty_fds[])
                FD_SET(pty_fds[PARENTFD], &fds_write);
                printf("pid %d Waiting for pty ready to write on %s...\n",
                        getpid(), name);
-               retval = select(pty_fds[PARENTFD]+1, NULL, &fds_write, NULL, NULL);
+               retval = select(pty_fds[PARENTFD]+2, NULL, &fds_write, NULL, NULL);
                if (retval == -1) {
                        perror("select");
                        fprintf(stderr, "Parent: Error in select\n");
@@ -120,12 +120,12 @@ void do_parent(int pty_fds[])
                        fprintf(stderr, "parent: write fd not set?! retrying\n");
                        continue;
                }
-               retval = write(pty_fds[PARENTFD], &data, 1024);
+               retval = write(pty_fds[PARENTFD], data, 1024);
                if (retval == -1) {
                        perror("write");
                        fprintf(stderr, "Error writing on pty\n");
                        exit(-1);
-               }
+               } else printf("wrote %d\n", retval);
        }
 
        /* got exit from user */

diff --git a/tools/mkboot b/tools/mkboot
index fabe80e4e6097947e6b56ab9615bd471dd02f48a..ea1e47c52033303458ac5880f6eb2d08f1c4ea50 100755 (executable)
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -174,7 +174,7 @@ cdfdboot)
        cp -p ../boot/boot /mnt/boot/boot || exit 1
        umount $dev || exit 1
        installboot -d $dev ../boot/bootblock boot/boot || exit 1
-       edparams $dev 'unset bootopts; unset servers; unset image; cdproberoot=1; unset rootdev; unset leader; leader() { echo \n--- Welcome to MINIX 3 ---\n\nThis is the MINIX boot monitor.\nPress ESC if you need to do any special configuration\nOtherwise I will boot with my defaults in 10 seconds\n\n }; bootcd=1; main(){delay 10000;boot}; save' || exit
+       edparams $dev 'unset bootopts; unset servers; disable=inet; unset image; cdproberoot=1; unset rootdev; unset leader; leader() { echo \n--- Welcome to MINIX 3 ---\n\nThis is the MINIX boot monitor.\nPress ESC if you need to do any special configuration\nOtherwise I will boot with my defaults in 10 seconds\n\n }; bootcd=1; main(){delay 10000;boot}; save' || exit
 
        # copy image
        dd if=$dev of=cdfdimage bs=8192 count=180