diff --git a/commands/dhcpd/devices.c b/commands/dhcpd/devices.c index 2ff4f22e6..3d12a1648 100755 --- a/commands/dhcpd/devices.c +++ b/commands/dhcpd/devices.c @@ -174,9 +174,7 @@ int opendev(network_t *np, fdtype_t fdtype, int compete) switch (fdtype) { case FT_ETHERNET: /* Set NONBLOCK to avoid waiting for a device driver to become ready */ - /* Outcommented again to make the orinoco driver work. See doc of - orinoco */ - fcntl(np->fdp->fd, F_SETFL, fcntl(np->fdp->fd, F_GETFL) /*| O_NONBLOCK*/); + fcntl(np->fdp->fd, F_SETFL, fcntl(np->fdp->fd, F_GETFL) | O_NONBLOCK); if (ioctl(np->fdp->fd, NWIOGETHSTAT, ðstat) < 0) { /* Not an Ethernet. */ close(fdp->fd); diff --git a/tools/release.sh b/tools/release.sh index 6a932c67b..ee6822534 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -133,7 +133,7 @@ do esac done -USRMB=650 +USRMB=400 USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`" USRSECTS="`expr $USRMB \* 1024 \* 2`" @@ -286,11 +286,10 @@ chmod -R u+w $RELEASEDIR/usr/lib if [ "$COPY" -ne 1 ] then echo " * Doing new svn export" - REPO="`cd ../ && svn info | grep '^URL: ' | awk '{ print $2 }'`" - DIRNAME=`basename $REPO` + REPO=https://gforge.cs.vu.nl/svn/minix/trunk/$SRC REVISION="`svn info $USERNAME $SVNREV $REPO | grep '^Revision: ' | awk '{ print $2 }'`" echo "Doing export of revision $REVISION from $REPO." - ( cd $RELEASEDIR/usr && svn $USERNAME export -r$REVISION $REPO && mv $DIRNAME $SRC ) + ( cd $RELEASEDIR/usr && svn $USERNAME export -r$REVISION $REPO ) REVTAG=r$REVISION echo "