Message ID | 20171020103840.32762-14-wei.liu2@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Wei Liu writes ("[OSSTEST PATCH 13/16] ts-debian-hvm-install: disable new nic naming scheme"): > This is required to fix nested hvm test. The L1 host is installed by > this script. We want the L1 host to not use the new nic naming scheme. The principle is fine. > + # Do not use "Predictable Network Interface Names" -- this can break > + # nested HVM tests. > + # https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/ > + # > + # See also > + # https://www.debian.org/releases/stretch/example-preseed.txt > + my $netifnames = ""; > + $netifnames = "\nd-i debian-installer/add-kernel-opts string net.ifnames=0\n" > + if $ho->{Suite} =~ m/stretch/; Please use a <<END here document. In fact, I think you should copy the style seen elsewhere nearby, so something like $preseed_file .= <<END if $ho->{Suite}.... d-i debian... etc. etc. END Ian.
diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 54d5d1c..7f8251d 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -114,6 +114,18 @@ set -ex in-target sed -i 's/^deb *cdrom/#&/g' /etc/apt/sources.list END + # Do not use "Predictable Network Interface Names" -- this can break + # nested HVM tests. + # https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/ + # + # See also + # https://www.debian.org/releases/stretch/example-preseed.txt + my $netifnames = ""; + $netifnames = "\nd-i debian-installer/add-kernel-opts string net.ifnames=0\n" + if $ho->{Suite} =~ m/stretch/; + + $preseed_file .= "$netifnames"; + $preseed_file .= preseed_hook_cmds(); return $preseed_file;
This is required to fix nested hvm test. The L1 host is installed by this script. We want the L1 host to not use the new nic naming scheme. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- ts-debian-hvm-install | 12 ++++++++++++ 1 file changed, 12 insertions(+)