Colin Walters 9785285
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
Colin Walters 9785285
index b1fdd31..eabc67c 100644
Colin Walters 9785285
--- a/cloudinit/settings.py
Colin Walters 9785285
+++ b/cloudinit/settings.py
Colin Walters 9785285
@@ -37,13 +37,16 @@ CFG_BUILTIN = {
090f910
     ],
090f910
     'def_log_file': '/var/log/cloud-init.log',
090f910
     'log_cfgs': [],
090f910
-    'syslog_fix_perms': ['syslog:adm', 'root:adm'],
090f910
+    'mount_default_fields': [None, None, 'auto', 'defaults,nofail', '0', '2'],
090f910
+    'ssh_deletekeys': False,
090f910
+    'ssh_genkeytypes': [],
090f910
+    'syslog_fix_perms': [],
090f910
     'system_info': {
090f910
         'paths': {
090f910
             'cloud_dir': '/var/lib/cloud',
090f910
             'templates_dir': '/etc/cloud/templates/',
090f910
         },
090f910
-        'distro': 'ubuntu',
090f910
+        'distro': 'fedora',
090f910
     },
090f910
     'vendor_data': {'enabled': True, 'prefix': []},
090f910
 }
Colin Walters 9785285
diff --git a/setup.py b/setup.py
Colin Walters 9785285
index 0403607..d213e66 100755
Colin Walters 9785285
--- a/setup.py
Colin Walters 9785285
+++ b/setup.py
Colin Walters 9785285
@@ -167,7 +167,6 @@ else:
Colin Walters 9785285
         (ETC + '/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
Colin Walters 9785285
         (ETC + '/cloud/templates', glob('templates/*')),
Colin Walters 9785285
         (ETC + '/NetworkManager/dispatcher.d/', ['tools/hook-network-manager']),
Colin Walters 9785285
-        (ETC + '/dhcp/dhclient-exit-hooks.d/', ['tools/hook-dhclient']),
Colin Walters 9785285
         (USR_LIB_EXEC + '/cloud-init', ['tools/uncloud-init',
Colin Walters 9785285
                                         'tools/write-ssh-key-fingerprints']),
Colin Walters 9785285
         (USR + '/share/doc/cloud-init', [f for f in glob('doc/*') if is_f(f)]),
Colin Walters 9785285
@@ -199,7 +198,6 @@ setuptools.setup(
Colin Walters 9785285
     scripts=['tools/cloud-init-per'],
Colin Walters 9785285
     license='Dual-licensed under GPLv3 or Apache 2.0',
Colin Walters 9785285
     data_files=data_files,
Colin Walters 9785285
-    install_requires=requirements,
Colin Walters 9785285
     cmdclass=cmdclass,
Colin Walters 9785285
     entry_points={
Colin Walters 9785285
         'console_scripts': [