Re: [uml-devel] [PATCH] uml: move TMP default from /tmp to /dev/shm.

[Rob Landley <rob@landley.net>]

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

On Monday 28 November 2005 13:27, Henrik Nordstrom wrote:
> On Mon, 28 Nov 2005, Jeff Dike wrote:
> > On Mon, Nov 28, 2005 at 11:52:15AM -0600, Rob Landley wrote:
> >> I sent a second copy that hopefully is less mangled.  Did it make it
> >> through ok?
> >
> > By eye, both looked the same.
>
> Not entirely, the first not only munged the whitespace, it also
> word-wrapped the diff lines..
>
> The second only munged the whitespace.
>
> Sending patches as attachments is generally safer than inline when using
> GUI mail programs.

Inline is linux-kernel policy, but here the darn thing is as an attachment.  
(No, I seem to have no control whatsoever over the type of the attachment.  I 
have checkboxes for "compress, encrypt, and sign" though, in case I can't 
figure out how to do that to the actual file...)

I need to find a real mail client, it seems.

Rob

[-- Attachment #2: devshm.patch --]
[-- Type: text/x-diff, Size: 1906 bytes --]

diff -ur linux-2.6.15-rc2/arch/um-old/os-Linux/mem.c linux-2.6.15-rc2/arch/um/os-Linux/mem.c
--- linux-2.6.15-rc2/arch/um-old/os-Linux/mem.c	2005-11-23 02:35:49.000000000 -0600
+++ linux-2.6.15-rc2/arch/um/os-Linux/mem.c	2005-11-28 09:33:21.158395976 -0600
@@ -34,7 +34,7 @@
 			break;
 	}
 	if((dir == NULL) || (*dir == '\0'))
-		dir = "/tmp";
+		dir = "/dev/shm";
 
 	tempdir = malloc(strlen(dir) + 2);
 	if(tempdir == NULL){
@@ -159,3 +159,26 @@
 	}
 	return(fd);
 }
+
+
+void check_tmpexec(void)
+{
+	void *addr;
+	int err, fd = create_tmp_file(UM_KERN_PAGE_SIZE);
+
+	addr = mmap(NULL, UM_KERN_PAGE_SIZE,
+		    PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE, fd, 0);
+	printf("Checking PROT_EXEC mmap in %s...",tempdir);
+	fflush(stdout);
+	if(addr == MAP_FAILED){
+		err = errno;
+		perror("failed");
+		if(err == EPERM)
+			printf("%s must be not mounted noexec\n",tempdir);
+		exit(1);
+	}
+	printf("OK\n");
+	munmap(addr, UM_KERN_PAGE_SIZE);
+
+	close(fd);
+}
diff -ur linux-2.6.15-rc2/arch/um-old/os-Linux/start_up.c linux-2.6.15-rc2/arch/um/os-Linux/start_up.c
--- linux-2.6.15-rc2/arch/um-old/os-Linux/start_up.c	2005-11-23 02:35:49.000000000 -0600
+++ linux-2.6.15-rc2/arch/um/os-Linux/start_up.c	2005-11-28 09:41:04.051025600 -0600
@@ -296,29 +296,7 @@
 	check_sysemu();
 }
 
-extern int create_tmp_file(unsigned long long len);
-
-static void check_tmpexec(void)
-{
-	void *addr;
-	int err, fd = create_tmp_file(UM_KERN_PAGE_SIZE);
-
-	addr = mmap(NULL, UM_KERN_PAGE_SIZE,
-		    PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE, fd, 0);
-	printf("Checking PROT_EXEC mmap in /tmp...");
-	fflush(stdout);
-	if(addr == MAP_FAILED){
-		err = errno;
-		perror("failed");
-		if(err == EPERM)
-			printf("/tmp must be not mounted noexec\n");
-		exit(1);
-	}
-	printf("OK\n");
-	munmap(addr, UM_KERN_PAGE_SIZE);
-
-	close(fd);
-}
+extern void check_tmpexec(void);
 
 void os_early_checks(void)
 {