testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Revert "Use some nmcli con down/ups to workaround RHBZ #1727411"

Browse Source 
This reverts commit 7ec143382f.
The bug it works around was fixed, so we shouldn't need the work
around any more.
This commit is contained in:
Adam Williamson 2019-07-09 17:40:01 -07:00
parent 1e729f1281
commit d34b5a3567
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tapnet.pm
View File

@ -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; 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 "printf '${conftext}\n' > /etc/sysconfig/network-scripts/ifcfg-eth0";
assert_script_run "systemctl restart NetworkManager.service"; 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... # the above doesn't seem to reliably set up resolv.conf, so...
clone_host_file "/etc/resolv.conf"; clone_host_file "/etc/resolv.conf";
} }