X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2Fpatches%2Fbusybox.patch;h=0e23b8f0f5e5cbcea820aa575956a81f614bf2f6;hp=5ad4113a9f69e1fe4b54b90847df3c25e785bd83;hb=18f9d34628d03afdf74b95ccd96e6e2e8441fb54;hpb=2da9f501b18d7ea223b06c8ce0676f9a083614d4

diff --git a/upstream/patches/busybox.patch b/upstream/patches/busybox.patch
index 5ad4113..0e23b8f 100644
--- a/upstream/patches/busybox.patch
+++ b/upstream/patches/busybox.patch
@@ -1118,3 +1118,32 @@ diff -ur ../busybox-1.00-pre9.orig/util-linux/more.c ./util-linux/more.c
 +# Debugging Options
 +#
 +# CONFIG_DEBUG is not set
+--- .config.old	2004-06-08 16:02:45.000000000 -0400
++++ .config	2004-06-08 16:05:23.000000000 -0400
+@@ -309,7 +309,11 @@
+ # CONFIG_ROUTE is not set
+ # CONFIG_TELNET is not set
+ # CONFIG_TELNETD is not set
+-# CONFIG_TFTP is not set
++CONFIG_TFTP=y
++CONFIG_FEATURE_TFTP_GET=y
++CONFIG_FEATURE_TFTP_PUT=y
++# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
++# CONFIG_FEATURE_TFTP_DEBUG is not set
+ # CONFIG_TRACEROUTE is not set
+ # CONFIG_VCONFIG is not set
+ CONFIG_WGET=y
+--- networking/tftp.c~	2004-06-08 16:50:30.000000000 -0400
++++ networking/tftp.c	2004-06-08 16:50:30.000000000 -0400
+@@ -320,7 +320,11 @@
+ 			FD_ZERO(&rfds);
+ 			FD_SET(socketfd, &rfds);
+ 
++#ifdef NESTEDVM
++			switch(1) {
++#else
+ 			switch (select(FD_SETSIZE, &rfds, NULL, NULL, &tv)) {
++#endif
+ 			case 1:
+ 				len = recvfrom(socketfd, buf, tftp_bufsize, 0,
+ 						(struct sockaddr *) &from, &fromlen);