Re: [systemd-devel] [PATCH] nspawn: be verbose about interface names

2015-05-24 Thread Tom Gundersen
On Fri, May 22, 2015 at 4:02 PM, Umut Tezduyar Lindskog
umut.tezdu...@axis.com wrote:
 Allowed interface name is relatively small. Lets not make
 users go in to the source code to figure out what happened.

 --machine=debian-tree conflicts with
 --machine=debian-tree2

 ex: Failed to add new veth \
  interfaces (host0, vb-debian-tree): File exists
 ---
  src/nspawn/nspawn.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
 index 5009363..646edea 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
 @@ -2627,7 +2627,7 @@ static int setup_veth(pid_t pid, char 
 iface_name[IFNAMSIZ], int *ifi) {

  r = sd_rtnl_call(rtnl, m, 0, NULL);
  if (r  0)
 -return log_error_errno(r, Failed to add new veth 
 interfaces: %m);
 +return log_error_errno(r, Failed to add new veth interfaces 
 (host0, %s): %m, iface_name);

  i = (int) if_nametoindex(iface_name);
  if (i = 0)
 --
 2.1.4

 ___
 systemd-devel mailing list
 systemd-devel@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Applied. Thansk!

Tom
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


[systemd-devel] [PATCH] nspawn: be verbose about interface names

2015-05-22 Thread Umut Tezduyar Lindskog
Allowed interface name is relatively small. Lets not make
users go in to the source code to figure out what happened.

--machine=debian-tree conflicts with
--machine=debian-tree2

ex: Failed to add new veth \
 interfaces (host0, vb-debian-tree): File exists
---
 src/nspawn/nspawn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 5009363..646edea 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2627,7 +2627,7 @@ static int setup_veth(pid_t pid, char 
iface_name[IFNAMSIZ], int *ifi) {
 
 r = sd_rtnl_call(rtnl, m, 0, NULL);
 if (r  0)
-return log_error_errno(r, Failed to add new veth interfaces: 
%m);
+return log_error_errno(r, Failed to add new veth interfaces 
(host0, %s): %m, iface_name);
 
 i = (int) if_nametoindex(iface_name);
 if (i = 0)
-- 
2.1.4

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] nspawn: be verbose about interface names

2015-05-22 Thread systemd github import bot
Patchset imported to github.
Pull request:
https://github.com/systemd-devs/systemd/compare/master...systemd-mailing-devs:1432303329-9184-1-git-send-email-umut.tezduyar%40axis.com

--
Generated by https://github.com/haraldh/mail2git
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel