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

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

Browse source
This commit is contained in:
Ben Gras 2005-08-05 19:19:18 +00:00
parent a9b7d3a172
commit 5789f7abec
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/mtree/minix.tree
View file

@ -30,8 +30,6 @@
755 root operator /usr/lib/keymaps 755 root operator /usr/lib/keymaps
755 root operator /usr/lib/m2 755 root operator /usr/lib/m2
755 root operator /usr/sbin 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
775 bin operator /usr/local/bin 775 bin operator /usr/local/bin
775 bin operator /usr/local/include 775 bin operator /usr/local/include

2
include/minix/config.h
View file

@ -3,7 +3,7 @@
/* Minix release and version numbers. */ /* Minix release and version numbers. */
#define OS_RELEASE "3" #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. /* This file sets configuration parameters for the MINIX kernel, FS, and PM.

1
test/Makefile
View file

@ -28,6 +28,7 @@ $(ROOTOBJ):
@rm a.out @rm a.out
clean: clean:
cd select && make clean
rm -rf *.o *.s *.bak test? test?? t10a t11a t11b DIR* rm -rf *.o *.s *.bak test? test?? t10a t11a t11b DIR*
test1: test1.c test1: test1.c

8
test/select/test14.c
View file

@ -55,7 +55,7 @@ void do_child(int pty_fds[])
FD_SET(pty_fds[CHILDFD], &fds_exception); FD_SET(pty_fds[CHILDFD], &fds_exception);
timeout.tv_sec = 5; timeout.tv_sec = 5;
timeout.tv_usec = 0; 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) { if (retval == -1) {
perror("select"); perror("select");
fprintf(stderr, "child: Error in select\n"); fprintf(stderr, "child: Error in select\n");
@ -102,7 +102,7 @@ void do_parent(int pty_fds[])
FD_SET(pty_fds[PARENTFD], &fds_write); FD_SET(pty_fds[PARENTFD], &fds_write);
printf("pid %d Waiting for pty ready to write on %s...\n", printf("pid %d Waiting for pty ready to write on %s...\n",
getpid(), name); 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) { if (retval == -1) {
perror("select"); perror("select");
fprintf(stderr, "Parent: Error in select\n"); 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"); fprintf(stderr, "parent: write fd not set?! retrying\n");
continue; continue;
} }
retval = write(pty_fds[PARENTFD], &data, 1024); retval = write(pty_fds[PARENTFD], data, 1024);
if (retval == -1) { if (retval == -1) {
perror("write"); perror("write");
fprintf(stderr, "Error writing on pty\n"); fprintf(stderr, "Error writing on pty\n");
exit(-1); exit(-1);
} } else printf("wrote %d\n", retval);
} }
/* got exit from user */ /* got exit from user */

2
tools/mkboot
View file

@ -174,7 +174,7 @@ cdfdboot)
cp -p ../boot/boot /mnt/boot/boot || exit 1 cp -p ../boot/boot /mnt/boot/boot || exit 1
umount $dev || exit 1 umount $dev || exit 1
installboot -d $dev ../boot/bootblock boot/boot || 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 # copy image
dd if=$dev of=cdfdimage bs=8192 count=180 dd if=$dev of=cdfdimage bs=8192 count=180