* [PATCH 1/2] um: xterm: make default terminal emulator configurable
@ 2022-03-24 12:13 Johannes Berg
2022-03-24 12:13 ` [PATCH 2/2] um: daemon: make default socket configurable Johannes Berg
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Johannes Berg @ 2022-03-24 12:13 UTC (permalink / raw)
To: linux-um; +Cc: Ritesh Raj Sarraf, Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
Make the default terminal emulator configurable so e.g.
Debian can set it to x-terminal-emulator instead of the
current default of xterm.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
arch/um/drivers/Kconfig | 7 +++++++
arch/um/drivers/Makefile | 2 ++
arch/um/drivers/xterm.c | 7 ++++---
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig
index f145842c40b9..521ae0d46076 100644
--- a/arch/um/drivers/Kconfig
+++ b/arch/um/drivers/Kconfig
@@ -64,6 +64,13 @@ config XTERM_CHAN
its own xterm.
It is safe to say 'Y' here.
+config XTERM_CHAN_DEFAULT_EMULATOR
+ string "xterm channel default terminal emulator"
+ depends on XTERM_CHAN
+ default "xterm"
+ help
+ This option allows changing the default terminal emulator.
+
config NOCONFIG_CHAN
bool
default !(XTERM_CHAN && TTY_CHAN && PTY_CHAN && PORT_CHAN && NULL_CHAN)
diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
index 803666e85414..e1dc4292bd22 100644
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
@@ -70,4 +70,6 @@ obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virt-pci.o
USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o vector_user.o
CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH)
+CFLAGS_xterm.o += '-DCONFIG_XTERM_CHAN_DEFAULT_EMULATOR="$(CONFIG_XTERM_CHAN_DEFAULT_EMULATOR)"'
+
include arch/um/scripts/Makefile.rules
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index 87ca4a47cd66..6918de5e2956 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -42,7 +42,7 @@ static void *xterm_init(char *str, int device, const struct chan_opts *opts)
}
/* Only changed by xterm_setup, which is a setup */
-static char *terminal_emulator = "xterm";
+static char *terminal_emulator = CONFIG_XTERM_CHAN_DEFAULT_EMULATOR;
static char *title_switch = "-T";
static char *exec_switch = "-e";
@@ -79,8 +79,9 @@ __uml_setup("xterm=", xterm_setup,
" respectively. The title switch must have the form '<switch> title',\n"
" not '<switch>=title'. Similarly, the exec switch must have the form\n"
" '<switch> command arg1 arg2 ...'.\n"
-" The default values are 'xterm=xterm,-T,-e'. Values for gnome-terminal\n"
-" are 'xterm=gnome-terminal,-t,-x'.\n\n"
+" The default values are 'xterm=" CONFIG_XTERM_CHAN_DEFAULT_EMULATOR
+ ",-T,-e'.\n"
+" Values for gnome-terminal are 'xterm=gnome-terminal,-t,-x'.\n\n"
);
static int xterm_open(int input, int output, int primary, void *d,
--
2.35.1
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] um: daemon: make default socket configurable
2022-03-24 12:13 [PATCH 1/2] um: xterm: make default terminal emulator configurable Johannes Berg
@ 2022-03-24 12:13 ` Johannes Berg
2022-03-24 12:18 ` Anton Ivanov
2022-03-24 16:22 ` Ritesh Raj Sarraf
2022-03-24 12:16 ` [PATCH 1/2] um: xterm: make default terminal emulator configurable Anton Ivanov
` (2 subsequent siblings)
3 siblings, 2 replies; 8+ messages in thread
From: Johannes Berg @ 2022-03-24 12:13 UTC (permalink / raw)
To: linux-um; +Cc: Ritesh Raj Sarraf, Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
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: Johannes Berg <johannes.berg@intel.com>
---
arch/um/drivers/Kconfig | 8 ++++++++
arch/um/drivers/daemon_kern.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig
index 521ae0d46076..914da774bd39 100644
--- a/arch/um/drivers/Kconfig
+++ b/arch/um/drivers/Kconfig
@@ -238,6 +238,14 @@ config UML_NET_DAEMON
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
bool "Vector I/O high performance network devices"
depends on UML_NET
diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index fd2402669c49..afde1e82c056 100644
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -65,7 +65,7 @@ static int daemon_setup(char *str, char **mac_out, void *data)
*init = ((struct daemon_init)
{ .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,
NULL);
--
2.35.1
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] um: xterm: make default terminal emulator configurable
2022-03-24 12:13 [PATCH 1/2] um: xterm: make default terminal emulator configurable Johannes Berg
2022-03-24 12:13 ` [PATCH 2/2] um: daemon: make default socket configurable Johannes Berg
@ 2022-03-24 12:16 ` Anton Ivanov
2022-03-24 12:18 ` Anton Ivanov
2022-03-24 16:21 ` Ritesh Raj Sarraf
3 siblings, 0 replies; 8+ messages in thread
From: Anton Ivanov @ 2022-03-24 12:16 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Ritesh Raj Sarraf, Johannes Berg
On 24/03/2022 12:13, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Make the default terminal emulator configurable so e.g.
> Debian can set it to x-terminal-emulator instead of the
> current default of xterm.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/drivers/Kconfig | 7 +++++++
> arch/um/drivers/Makefile | 2 ++
> arch/um/drivers/xterm.c | 7 ++++---
> 3 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig
> index f145842c40b9..521ae0d46076 100644
> --- a/arch/um/drivers/Kconfig
> +++ b/arch/um/drivers/Kconfig
> @@ -64,6 +64,13 @@ config XTERM_CHAN
> its own xterm.
> It is safe to say 'Y' here.
>
> +config XTERM_CHAN_DEFAULT_EMULATOR
> + string "xterm channel default terminal emulator"
> + depends on XTERM_CHAN
> + default "xterm"
> + help
> + This option allows changing the default terminal emulator.
> +
> config NOCONFIG_CHAN
> bool
> default !(XTERM_CHAN && TTY_CHAN && PTY_CHAN && PORT_CHAN && NULL_CHAN)
> diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
> index 803666e85414..e1dc4292bd22 100644
> --- a/arch/um/drivers/Makefile
> +++ b/arch/um/drivers/Makefile
> @@ -70,4 +70,6 @@ obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virt-pci.o
> USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o vector_user.o
> CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH)
>
> +CFLAGS_xterm.o += '-DCONFIG_XTERM_CHAN_DEFAULT_EMULATOR="$(CONFIG_XTERM_CHAN_DEFAULT_EMULATOR)"'
> +
> include arch/um/scripts/Makefile.rules
> diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
> index 87ca4a47cd66..6918de5e2956 100644
> --- a/arch/um/drivers/xterm.c
> +++ b/arch/um/drivers/xterm.c
> @@ -42,7 +42,7 @@ static void *xterm_init(char *str, int device, const struct chan_opts *opts)
> }
>
> /* Only changed by xterm_setup, which is a setup */
> -static char *terminal_emulator = "xterm";
> +static char *terminal_emulator = CONFIG_XTERM_CHAN_DEFAULT_EMULATOR;
> static char *title_switch = "-T";
> static char *exec_switch = "-e";
>
> @@ -79,8 +79,9 @@ __uml_setup("xterm=", xterm_setup,
> " respectively. The title switch must have the form '<switch> title',\n"
> " not '<switch>=title'. Similarly, the exec switch must have the form\n"
> " '<switch> command arg1 arg2 ...'.\n"
> -" The default values are 'xterm=xterm,-T,-e'. Values for gnome-terminal\n"
> -" are 'xterm=gnome-terminal,-t,-x'.\n\n"
> +" The default values are 'xterm=" CONFIG_XTERM_CHAN_DEFAULT_EMULATOR
> + ",-T,-e'.\n"
> +" Values for gnome-terminal are 'xterm=gnome-terminal,-t,-x'.\n\n"
> );
>
> static int xterm_open(int input, int output, int primary, void *d,
>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] um: xterm: make default terminal emulator configurable
2022-03-24 12:13 [PATCH 1/2] um: xterm: make default terminal emulator configurable Johannes Berg
2022-03-24 12:13 ` [PATCH 2/2] um: daemon: make default socket configurable Johannes Berg
2022-03-24 12:16 ` [PATCH 1/2] um: xterm: make default terminal emulator configurable Anton Ivanov
@ 2022-03-24 12:18 ` Anton Ivanov
2022-03-24 12:19 ` Johannes Berg
2022-03-24 16:21 ` Ritesh Raj Sarraf
3 siblings, 1 reply; 8+ messages in thread
From: Anton Ivanov @ 2022-03-24 12:18 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Ritesh Raj Sarraf, Johannes Berg
On 24/03/2022 12:13, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Make the default terminal emulator configurable so e.g.
> Debian can set it to x-terminal-emulator instead of the
> current default of xterm.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/drivers/Kconfig | 7 +++++++
> arch/um/drivers/Makefile | 2 ++
> arch/um/drivers/xterm.c | 7 ++++---
> 3 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig
> index f145842c40b9..521ae0d46076 100644
> --- a/arch/um/drivers/Kconfig
> +++ b/arch/um/drivers/Kconfig
> @@ -64,6 +64,13 @@ config XTERM_CHAN
> its own xterm.
> It is safe to say 'Y' here.
>
> +config XTERM_CHAN_DEFAULT_EMULATOR
> + string "xterm channel default terminal emulator"
> + depends on XTERM_CHAN
> + default "xterm"
> + help
> + This option allows changing the default terminal emulator.
> +
> config NOCONFIG_CHAN
> bool
> default !(XTERM_CHAN && TTY_CHAN && PTY_CHAN && PORT_CHAN && NULL_CHAN)
> diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
> index 803666e85414..e1dc4292bd22 100644
> --- a/arch/um/drivers/Makefile
> +++ b/arch/um/drivers/Makefile
> @@ -70,4 +70,6 @@ obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virt-pci.o
> USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o vector_user.o
> CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH)
>
> +CFLAGS_xterm.o += '-DCONFIG_XTERM_CHAN_DEFAULT_EMULATOR="$(CONFIG_XTERM_CHAN_DEFAULT_EMULATOR)"'
> +
> include arch/um/scripts/Makefile.rules
> diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
> index 87ca4a47cd66..6918de5e2956 100644
> --- a/arch/um/drivers/xterm.c
> +++ b/arch/um/drivers/xterm.c
> @@ -42,7 +42,7 @@ static void *xterm_init(char *str, int device, const struct chan_opts *opts)
> }
>
> /* Only changed by xterm_setup, which is a setup */
> -static char *terminal_emulator = "xterm";
> +static char *terminal_emulator = CONFIG_XTERM_CHAN_DEFAULT_EMULATOR;
> static char *title_switch = "-T";
> static char *exec_switch = "-e";
>
> @@ -79,8 +79,9 @@ __uml_setup("xterm=", xterm_setup,
> " respectively. The title switch must have the form '<switch> title',\n"
> " not '<switch>=title'. Similarly, the exec switch must have the form\n"
> " '<switch> command arg1 arg2 ...'.\n"
> -" The default values are 'xterm=xterm,-T,-e'. Values for gnome-terminal\n"
> -" are 'xterm=gnome-terminal,-t,-x'.\n\n"
> +" The default values are 'xterm=" CONFIG_XTERM_CHAN_DEFAULT_EMULATOR
> + ",-T,-e'.\n"
> +" Values for gnome-terminal are 'xterm=gnome-terminal,-t,-x'.\n\n"
> );
>
> static int xterm_open(int input, int output, int primary, void *d,
>
I was going to fw this to Debian as they patch this and integrate with Debian alternatives. I see Ritesh is already in the loop. Cool.
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] um: daemon: make default socket configurable
2022-03-24 12:13 ` [PATCH 2/2] um: daemon: make default socket configurable Johannes Berg
@ 2022-03-24 12:18 ` Anton Ivanov
2022-03-24 16:22 ` Ritesh Raj Sarraf
1 sibling, 0 replies; 8+ messages in thread
From: Anton Ivanov @ 2022-03-24 12:18 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Ritesh Raj Sarraf, Johannes Berg
On 24/03/2022 12:13, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> 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: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/drivers/Kconfig | 8 ++++++++
> arch/um/drivers/daemon_kern.c | 2 +-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig
> index 521ae0d46076..914da774bd39 100644
> --- a/arch/um/drivers/Kconfig
> +++ b/arch/um/drivers/Kconfig
> @@ -238,6 +238,14 @@ config UML_NET_DAEMON
>
> 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
> bool "Vector I/O high performance network devices"
> depends on UML_NET
> diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
> index fd2402669c49..afde1e82c056 100644
> --- a/arch/um/drivers/daemon_kern.c
> +++ b/arch/um/drivers/daemon_kern.c
> @@ -65,7 +65,7 @@ static int daemon_setup(char *str, char **mac_out, void *data)
>
> *init = ((struct daemon_init)
> { .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,
> NULL);
>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
https://www.kot-begemot.co.uk/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] um: xterm: make default terminal emulator configurable
2022-03-24 12:18 ` Anton Ivanov
@ 2022-03-24 12:19 ` Johannes Berg
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Berg @ 2022-03-24 12:19 UTC (permalink / raw)
To: Anton Ivanov, linux-um; +Cc: Ritesh Raj Sarraf
On Thu, 2022-03-24 at 12:18 +0000, Anton Ivanov wrote:
>
> I was going to fw this to Debian as they patch this and integrate with
> Debian alternatives. I see Ritesh is already in the loop. Cool.
>
Yeah, it actually came up in an LWN discussion:
https://lwn.net/Articles/888507/
johannes
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] um: xterm: make default terminal emulator configurable
2022-03-24 12:13 [PATCH 1/2] um: xterm: make default terminal emulator configurable Johannes Berg
` (2 preceding siblings ...)
2022-03-24 12:18 ` Anton Ivanov
@ 2022-03-24 16:21 ` Ritesh Raj Sarraf
3 siblings, 0 replies; 8+ messages in thread
From: Ritesh Raj Sarraf @ 2022-03-24 16:21 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Johannes Berg
[-- Attachment #1.1: Type: text/plain, Size: 3188 bytes --]
On Thu, 2022-03-24 at 13:13 +0100, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Make the default terminal emulator configurable so e.g.
> Debian can set it to x-terminal-emulator instead of the
> current default of xterm.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/drivers/Kconfig | 7 +++++++
> arch/um/drivers/Makefile | 2 ++
> arch/um/drivers/xterm.c | 7 ++++---
> 3 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig
> index f145842c40b9..521ae0d46076 100644
> --- a/arch/um/drivers/Kconfig
> +++ b/arch/um/drivers/Kconfig
> @@ -64,6 +64,13 @@ config XTERM_CHAN
> its own xterm.
> It is safe to say 'Y' here.
>
> +config XTERM_CHAN_DEFAULT_EMULATOR
> + string "xterm channel default terminal emulator"
> + depends on XTERM_CHAN
> + default "xterm"
> + help
> + This option allows changing the default terminal emulator.
> +
> config NOCONFIG_CHAN
> bool
> default !(XTERM_CHAN && TTY_CHAN && PTY_CHAN && PORT_CHAN &&
> NULL_CHAN)
> diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
> index 803666e85414..e1dc4292bd22 100644
> --- a/arch/um/drivers/Makefile
> +++ b/arch/um/drivers/Makefile
> @@ -70,4 +70,6 @@ obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virt-pci.o
> USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o
> pcap_user.o vde_user.o vector_user.o
> CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH)
>
> +CFLAGS_xterm.o += '-
> DCONFIG_XTERM_CHAN_DEFAULT_EMULATOR="$(CONFIG_XTERM_CHAN_DEFAULT_EMUL
> ATOR)"'
> +
> include arch/um/scripts/Makefile.rules
> diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
> index 87ca4a47cd66..6918de5e2956 100644
> --- a/arch/um/drivers/xterm.c
> +++ b/arch/um/drivers/xterm.c
> @@ -42,7 +42,7 @@ static void *xterm_init(char *str, int device,
> const struct chan_opts *opts)
> }
>
> /* Only changed by xterm_setup, which is a setup */
> -static char *terminal_emulator = "xterm";
> +static char *terminal_emulator = CONFIG_XTERM_CHAN_DEFAULT_EMULATOR;
> static char *title_switch = "-T";
> static char *exec_switch = "-e";
>
> @@ -79,8 +79,9 @@ __uml_setup("xterm=", xterm_setup,
> " respectively. The title switch must have the form '<switch>
> title',\n"
> " not '<switch>=title'. Similarly, the exec switch must have the
> form\n"
> " '<switch> command arg1 arg2 ...'.\n"
> -" The default values are 'xterm=xterm,-T,-e'. Values for gnome-
> terminal\n"
> -" are 'xterm=gnome-terminal,-t,-x'.\n\n"
> +" The default values are 'xterm="
> CONFIG_XTERM_CHAN_DEFAULT_EMULATOR
> + ",-T,-e'.\n"
> +" Values for gnome-terminal are 'xterm=gnome-terminal,-t,-
> x'.\n\n"
> );
>
> static int xterm_open(int input, int output, int primary, void *d,
Thank you for the quick fixes.
Tested-by: Ritesh Raj Sarraf <ritesh@collabora.com>
--
Ritesh Raj Sarraf
Collabora
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 152 bytes --]
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] um: daemon: make default socket configurable
2022-03-24 12:13 ` [PATCH 2/2] um: daemon: make default socket configurable Johannes Berg
2022-03-24 12:18 ` Anton Ivanov
@ 2022-03-24 16:22 ` Ritesh Raj Sarraf
1 sibling, 0 replies; 8+ messages in thread
From: Ritesh Raj Sarraf @ 2022-03-24 16:22 UTC (permalink / raw)
To: Johannes Berg, linux-um; +Cc: Johannes Berg
[-- Attachment #1.1: Type: text/plain, Size: 2161 bytes --]
On Thu, 2022-03-24 at 13:13 +0100, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> 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: Johannes Berg <johannes.berg@intel.com>
> ---
> arch/um/drivers/Kconfig | 8 ++++++++
> arch/um/drivers/daemon_kern.c | 2 +-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig
> index 521ae0d46076..914da774bd39 100644
> --- a/arch/um/drivers/Kconfig
> +++ b/arch/um/drivers/Kconfig
> @@ -238,6 +238,14 @@ config UML_NET_DAEMON
>
> 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
> bool "Vector I/O high performance network devices"
> depends on UML_NET
> diff --git a/arch/um/drivers/daemon_kern.c
> b/arch/um/drivers/daemon_kern.c
> index fd2402669c49..afde1e82c056 100644
> --- a/arch/um/drivers/daemon_kern.c
> +++ b/arch/um/drivers/daemon_kern.c
> @@ -65,7 +65,7 @@ static int daemon_setup(char *str, char **mac_out,
> void *data)
>
> *init = ((struct daemon_init)
> { .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,
> NULL);
Tested-by: Ritesh Raj Sarraf <ritesh@collabora.com>
--
Ritesh Raj Sarraf
Collabora
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 152 bytes --]
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-03-24 16:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-24 12:13 [PATCH 1/2] um: xterm: make default terminal emulator configurable Johannes Berg
2022-03-24 12:13 ` [PATCH 2/2] um: daemon: make default socket configurable Johannes Berg
2022-03-24 12:18 ` Anton Ivanov
2022-03-24 16:22 ` Ritesh Raj Sarraf
2022-03-24 12:16 ` [PATCH 1/2] um: xterm: make default terminal emulator configurable Anton Ivanov
2022-03-24 12:18 ` Anton Ivanov
2022-03-24 12:19 ` Johannes Berg
2022-03-24 16:21 ` Ritesh Raj Sarraf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.