SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nspawn: when adding a veth interface to a bridge, use the "vb-" rather than "ve-" interface name prefix

Browse Source 
This way we can recognize the interfaces later on to apply different
host-side configuration to them.
This commit is contained in:
Lennart Poettering
2014-02-21 04:02:12 +01:00
parent 90e633a790
commit 08af0da269
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+9 -2
View File
@@ -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();