From d34b5a35673bc7f30da7178c2711abfd578a602d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 9 Jul 2019 17:40:01 -0700 Subject: [PATCH] Revert "Use some nmcli con down/ups to workaround RHBZ #1727411" This reverts commit 7ec143382f03cc03c973ed40c15fbc031f68069d. The bug it works around was fixed, so we shouldn't need the work around any more. --- lib/tapnet.pm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/tapnet.pm b/lib/tapnet.pm index 8f1039a0..4e36cd84 100644 --- a/lib/tapnet.pm +++ b/lib/tapnet.pm @@ -52,12 +52,6 @@ sub setup_tap_static { my $conftext = "DEVICE=eth0\nBOOTPROTO=none\nIPADDR=$ip\nGATEWAY=10.0.2.2\nPREFIX=24\nDEFROUTE=yes\nONBOOT=yes" . $dnstext; assert_script_run "printf '${conftext}\n' > /etc/sysconfig/network-scripts/ifcfg-eth0"; assert_script_run "systemctl restart NetworkManager.service"; - # FIXME workaround for - # https://bugzilla.redhat.com/show_bug.cgi?id=1727411 - # remove when that's resolved - script_run 'nmcli con down "Wired connection 1"'; - script_run 'nmcli con down "System eth0"'; - script_run 'nmcli con up "System eth0"'; # the above doesn't seem to reliably set up resolv.conf, so... clone_host_file "/etc/resolv.conf"; }