diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index a881c006..b0f2ccf5 100644
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
@@ -293,13 +293,14 @@ class Renderer(renderer.Renderer):
                 #    iface_cfg['BOOTPROTO'] = 'static'
                 if subnet_is_ipv6(subnet):
                     iface_cfg['IPV6INIT'] = True
-            elif subnet_type == 'manual':
-                iface_cfg['ONBOOT'] = False
             else:
                 raise ValueError("Unknown subnet type '%s' found"
                                  " for interface '%s'" % (subnet_type,
                                                           iface_cfg.name))
 
+            if subnet.get('control') == 'manual':
+                iface_cfg['ONBOOT'] = False
+
         # set IPv4 and IPv6 static addresses
         ipv4_index = -1
         ipv6_index = -1