Merge #1952

1952: [daemon] disallow `--network ...,mode=auto` on Ubuntu Core 16 r=luis4a0,townsend2010 a=Saviq `netplan` in the image is too old to handle our config: ```plain Stderr: Error in network definition //etc/netplan/50-cloud-init.yaml line 12 column 12: unknown key dhcp4-overrides ``` Co-authored-by: Michał Sawicz <[email protected]>
canonical · Feb 5, 2021 · c541aff · c541aff
1 parent 9552990
commit c541aff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
@@ -92,7 +92,7 @@ const std::unordered_set<std::string> no_bridging_images = {
     "release:12.10", "release:quantal", "release:13.04", "release:raring",  "release:13.10", "release:saucy",
     "release:14.04", "release:trusty",  "release:14.10", "release:utopic",  "release:15.04", "release:vivid",
     "release:15.10", "release:wily",    "release:16.04", "release:xenial",  "release:16.10", "release:yakkety",
-    "release:17.04", "release:zesty",   "snapcraft:core"};
+    "release:17.04", "release:zesty",   "release:core",  "release:core16",  "snapcraft:core"};
 
 mp::Query query_from(const mp::LaunchRequest* request, const std::string& name)
 {