On NetworkManager systems, apply the boot-time IP config rather than activating a single interface

Author: jcameron

Diff for: feature-virt.pl

@@ -43,7 +43,12 @@ sub setup_virt
 		      };
 	$virt->{'fullname'} = $virt->{'name'}.":".$virt->{'virtual'};
 	&net::save_interface($virt);
-	&net::activate_interface($virt);
+	if (&auto_apply_interface()) {
+		&net::apply_network();
+		}
+	else {
+		&net::activate_interface($virt);
+		}
 	$d->{'iface'} = $virt->{'fullname'};
 	&$second_print(&text('setup_virtdone', $d->{'iface'}));
 	}
@@ -83,8 +88,12 @@ sub delete_virt
 		}
 	elsif ($biface->{'virtual'} ne '') {
 		&net::delete_interface($biface);
-		&net::deactivate_interface($aiface)
-			if ($aiface && $aiface->{'virtual'} ne '');
+		if (&auto_apply_interface()) {
+			&net::apply_network();
+			}
+		elsif ($aiface && $aiface->{'virtual'} ne '') {
+			&net::deactivate_interface($aiface)
+			}
 		&$second_print($text{'setup_done'});
 		}
 	else {
@@ -112,12 +121,15 @@ sub modify_virt
 			       &net::boot_interfaces();
 	local ($aiface) = grep { $_->{'address'} eq $oldd->{'ip'} }
 			       &net::active_interfaces();
-	if ($biface && $aiface) {
+	if ($biface) {
 		if ($biface->{'virtual'} ne '') {
 			$biface->{'address'} = $d->{'ip'};
 			&net::save_interface($biface);
 			}
-		if ($aiface->{'virtual'} ne '') {
+		if (&auto_apply_interface()) {
+			&net::apply_network();
+			}
+		elsif ($aiface->{'virtual'} ne '') {
 			$aiface->{'address'} = $d->{'ip'};
 			&net::activate_interface($aiface);
 			}
@@ -488,6 +500,15 @@ sub can_reset_virt
 return 0;
 }
 
+# auto_apply_interface()
+# Returns 1 if changes should only be made to the boot-time interface config,
+# and then applied
+sub auto_apply_interface
+{
+&foreign_require("net");
+return $net::net_mode eq "nm";
+}
+
 $done_feature_script{'virt'} = 1;
 
 1;

Diff for: feature-virt6.pl

@@ -363,12 +363,17 @@ sub activate_ip6_interface
 {
 local ($iface) = @_;
 &foreign_require("net");
-my @active = &net::active_interfaces();
-my ($active) = grep { $_->{'fullname'} eq $iface->{'name'} } @active;
-$active || &error("No active interface found for $iface->{'name'}");
-push(@{$active->{'address6'}}, $iface->{'address'});
-push(@{$active->{'netmask6'}}, $iface->{'netmask'});
-&net::activate_interface($active);
+if (&auto_apply_interface()) {
+	&net::apply_network();
+	}
+else {
+	my @active = &net::active_interfaces();
+	my ($active) = grep { $_->{'fullname'} eq $iface->{'name'} } @active;
+	$active || &error("No active interface found for $iface->{'name'}");
+	push(@{$active->{'address6'}}, $iface->{'address'});
+	push(@{$active->{'netmask6'}}, $iface->{'netmask'});
+	&net::activate_interface($active);
+	}
 }
 
 # save_ip6_interface(&iface)
@@ -390,20 +395,25 @@ sub save_ip6_interface
 sub deactivate_ip6_interface
 {
 local ($iface) = @_;
-my @active = &net::active_interfaces();
-my ($active) = grep { $_->{'fullname'} eq $iface->{'name'} } @active;
-$active || &error("No active interface found for $iface->{'name'}");
-my $found = 0;
-for(my $i=0; $i<@{$active->{'address6'}}; $i++) {
-	if (&canonicalize_ip6($iface->{'address'}) eq
-	    &canonicalize_ip6($active->{'address6'}->[$i])) {
-		splice(@{$active->{'address6'}}, $i, 1);
-		splice(@{$active->{'netmask6'}}, $i, 1);
-		$found++;
-		}
+if (&auto_apply_interface()) {
+	&net::apply_network();
 	}
-if ($found) {
-	&net::activate_interface($active);
+else {
+	my @active = &net::active_interfaces();
+	my ($active) = grep { $_->{'fullname'} eq $iface->{'name'} } @active;
+	$active || &error("No active interface found for $iface->{'name'}");
+	my $found = 0;
+	for(my $i=0; $i<@{$active->{'address6'}}; $i++) {
+		if (&canonicalize_ip6($iface->{'address'}) eq
+		    &canonicalize_ip6($active->{'address6'}->[$i])) {
+			splice(@{$active->{'address6'}}, $i, 1);
+			splice(@{$active->{'netmask6'}}, $i, 1);
+			$found++;
+			}
+		}
+	if ($found) {
+		&net::activate_interface($active);
+		}
 	}
 }
 

Diff for: virtual-server-lib-funcs.pl

@@ -17313,7 +17313,12 @@ sub activate_shared_ip
 	      };
 $virt->{'fullname'} = $virt->{'name'}.":".$virt->{'virtual'};
 &net::save_interface($virt);
-&net::activate_interface($virt);
+if (&auto_apply_interface()) {
+	&net::apply_network();
+	}
+else {
+	&net::activate_interface($virt);
+	}
 return undef;
 }