From 08af0da26935e827b58809ff1946e2f7d496e666 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Feb 2014 04:02:12 +0100
Subject: nspawn: when adding a veth interface to a bridge, use the "vb-"
 rather than "ve-" interface name prefix

This way we can recognize the interfaces later on to apply different
host-side configuration to them.
---
 src/nspawn/nspawn.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 0a00903ef4..2441758c2a 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1302,7 +1302,7 @@ static int reset_audit_loginuid(void) {
         return 0;
 }
 
-static int setup_veth(pid_t pid, char iface_name[]) {
+static int setup_veth(pid_t pid, char iface_name[IFNAMSIZ]) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
         _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
         int r;
@@ -1313,6 +1313,13 @@ static int setup_veth(pid_t pid, char iface_name[]) {
         if (!arg_network_veth)
                 return 0;
 
+        /* Use two different interface name prefixes depending whether
+         * we are in bridge mode or not. */
+        if (arg_network_bridge)
+                memcpy(iface_name, "vb-", 3);
+        else
+                memcpy(iface_name, "ve-", 3);
+
         strncpy(iface_name+3, arg_machine, IFNAMSIZ - 3);
 
         r = sd_rtnl_open(&rtnl, 0);
@@ -1587,7 +1594,7 @@ int main(int argc, char *argv[]) {
         int n_fd_passed;
         pid_t pid = 0;
         sigset_t mask;
-        char veth_name[IFNAMSIZ] = "ve-";
+        char veth_name[IFNAMSIZ];
 
         log_parse_environment();
         log_open();
-- 
cgit v1.2.3-54-g00ecf