Commit b0cbccf4 authored by Johannes Berg's avatar Johannes Berg Committed by Richard Weinberger
Browse files

um: daemon: Make default socket configurable 



Even if daemon network is deprecated, some configurations may
still use it (e.g. Debian), and not want to default to the
/tmp/uml.ctl socket location. Allow configuring the default
socket location.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-By: default avatarAnton Ivanov <anton.ivanov@cambridgegreys.com>
Tested-by: default avatarRitesh Raj Sarraf <ritesh@collabora.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 16aa835a

arch/um/drivers/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -238,6 +238,14 @@ config UML_NET_DAEMON 




	  If unsure, say N.

	  If unsure, say N.





config UML_NET_DAEMON_DEFAULT_SOCK

	string "Default socket for daemon transport"

	default "/tmp/uml.ctl"

	depends on UML_NET_DAEMON

	help

	  This option allows setting the default socket for the daemon

	  transport, normally it defaults to /tmp/uml.ctl.



config UML_NET_VECTOR

config UML_NET_VECTOR

	bool "Vector I/O high performance network devices"

	bool "Vector I/O high performance network devices"

	depends on UML_NET

	depends on UML_NET

arch/um/drivers/daemon_kern.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ static int daemon_setup(char *str, char **mac_out, void *data) 




	*init = ((struct daemon_init)

	*init = ((struct daemon_init)

		{ .sock_type 		= "unix",

		{ .sock_type 		= "unix",

		  .ctl_sock 		= "/tmp/uml.ctl" });

		  .ctl_sock 		= CONFIG_UML_NET_DAEMON_DEFAULT_SOCK });





	remain = split_if_spec(str, mac_out, &init->sock_type, &init->ctl_sock,

	remain = split_if_spec(str, mac_out, &init->sock_type, &init->ctl_sock,

			       NULL);

			       NULL);