[Pkg-uml-commit] r79 - in trunk/src/user-mode-linux/debian: . patches

[Mattia Dongili]

Author: malattia
Date: 2006-05-21 17:58:18 +0000 (Sun, 21 May 2006)
New Revision: 79

Added:
   trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff
Removed:
   trunk/src/user-mode-linux/debian/patches/uml_switch.diff
Modified:
   trunk/src/user-mode-linux/debian/changelog
   trunk/src/user-mode-linux/debian/patches/00list
Log:
add 03_uml_switch patch (Closes: #367132)

Modified: trunk/src/user-mode-linux/debian/changelog
===================================================================
--- trunk/src/user-mode-linux/debian/changelog	2006-05-21 17:06:48 UTC (rev 78)
+++ trunk/src/user-mode-linux/debian/changelog	2006-05-21 17:58:18 UTC (rev 79)
@@ -1,3 +1,10 @@
+user-mode-linux (2.6.16-1um-3) unstable; urgency=low
+
+  [Mattia Dongili]:
+  * add 03_uml_switch patch (Closes: #367132)
+
+ -- Mattia Dongili <malattia at debian.org>  Sun, 21 May 2006 19:44:44 +0200
+
 user-mode-linux (2.6.16-1um-2) unstable; urgency=low
 
   [Mattia Dongili]:

Modified: trunk/src/user-mode-linux/debian/patches/00list
===================================================================
--- trunk/src/user-mode-linux/debian/patches/00list	2006-05-21 17:06:48 UTC (rev 78)
+++ trunk/src/user-mode-linux/debian/patches/00list	2006-05-21 17:58:18 UTC (rev 79)
@@ -1,2 +1,3 @@
 01_uml_net.dpatch
 02_x-terminal-emulator.dpatch
+03_uml_switch.diff

Added: trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff
===================================================================
--- trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff	2006-05-21 17:06:48 UTC (rev 78)
+++ trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff	2006-05-21 17:58:18 UTC (rev 79)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_uml_switch - Mattia Dongili <malattia at debian.org>
+## rediffed from previous mdz patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use Debian's standard location for uml_net helper
+
+ at DPATCH@
+
+# Author: malattia
+# Status: none
+
+--- linux-source-2.6.16/arch/um/drivers/daemon_kern.c~clean	2006-05-21 19:26:36.647788742 +0200
++++ linux-source-2.6.16/arch/um/drivers/daemon_kern.c	2006-05-21 19:26:43.208198742 +0200
+@@ -71,7 +71,7 @@
+ 
+ 	*init = ((struct daemon_init)
+ 		{ .sock_type 		= "unix",
+-		  .ctl_sock 		= "/tmp/uml.ctl" });
++		  .ctl_sock 		= "/var/run/uml-utilities/uml_switch.ctl" });
+ 	
+ 	remain = split_if_spec(str, mac_out, &init->sock_type, &init->ctl_sock,
+ 			       NULL);


Property changes on: trunk/src/user-mode-linux/debian/patches/03_uml_switch.diff
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/src/user-mode-linux/debian/patches/uml_switch.diff
===================================================================
--- trunk/src/user-mode-linux/debian/patches/uml_switch.diff	2006-05-21 17:06:48 UTC (rev 78)
+++ trunk/src/user-mode-linux/debian/patches/uml_switch.diff	2006-05-21 17:58:18 UTC (rev 79)
@@ -1,11 +0,0 @@
---- kernel-source-2.4.22/arch/um/drivers/daemon_kern.c.orig	2003-09-19 21:32:52.000000000 -0400
-+++ kernel-source-2.4.22/arch/um/drivers/daemon_kern.c	2003-09-19 21:32:53.000000000 -0400
-@@ -72,7 +72,7 @@
- 
- 	*init = ((struct daemon_init)
- 		{ .sock_type 		= "unix",
--		  .ctl_sock 		= "/tmp/uml.ctl" });
-+		  .ctl_sock 		= "/var/run/uml-utilities/uml_switch.ctl" });
- 	
- 	remain = split_if_spec(str, mac_out, &init->sock_type, &init->ctl_sock,
- 			       NULL);