Tag of 3.1.3a, an incremental release of 3.1.3.

diff --git a/commands/dhcpd/devices.c b/commands/dhcpd/devices.c
index 3d12a16489e8d0c583d8d84af54c10729b8281c6..2ff4f22e6d6c6d5e68d1b30eb2a60914bbd11ea4 100755 (executable)
--- a/commands/dhcpd/devices.c
+++ b/commands/dhcpd/devices.c
@@ -174,7 +174,9 @@ 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 */
-       fcntl(np->fdp->fd, F_SETFL, fcntl(np->fdp->fd, F_GETFL) | O_NONBLOCK);
+       /* 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*/);
        if (ioctl(np->fdp->fd, NWIOGETHSTAT, &ethstat) < 0) {
            /* Not an Ethernet. */
            close(fdp->fd);

diff --git a/tools/release.sh b/tools/release.sh
index ee6822534c640d982ed189956940aacb947bdfde..6a932c67b3f5da02d37e2951a11beeec8fea878a 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -133,7 +133,7 @@ do
        esac
 done
 
-USRMB=400
+USRMB=650
 
 USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`"
 USRSECTS="`expr $USRMB \* 1024 \* 2`"
@@ -286,10 +286,11 @@ chmod -R u+w $RELEASEDIR/usr/lib
 if [ "$COPY" -ne 1 ]
 then
        echo " * Doing new svn export"
-       REPO=https://gforge.cs.vu.nl/svn/minix/trunk/$SRC
+       REPO="`cd ../ && svn info | grep '^URL: ' | awk '{ print $2 }'`"
+       DIRNAME=`basename $REPO`
        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 )
+       ( cd $RELEASEDIR/usr && svn $USERNAME export -r$REVISION $REPO && mv $DIRNAME $SRC )
        REVTAG=r$REVISION
        echo "