|
 |
d3c36a |
From 077181aa07cc3ca11d526b421b4d4e006bd5eba7 Mon Sep 17 00:00:00 2001
|
|
|
d3c36a |
From: Lars Kellogg-Stedman <lars@redhat.com>
|
|
|
d3c36a |
Date: Mon, 23 Jun 2014 13:13:24 -0400
|
|
|
d3c36a |
Subject: [PATCH] update paths for rhel
|
|
|
d3c36a |
|
|
|
d3c36a |
---
|
|
|
d3c36a |
cloudinit/config/cc_keys_to_console.py | 2 +-
|
|
|
d3c36a |
setup.py | 4 ++--
|
|
|
d3c36a |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
d3c36a |
|
|
|
d3c36a |
diff --git a/cloudinit/config/cc_keys_to_console.py b/cloudinit/config/cc_keys_to_console.py
|
|
|
d3c36a |
index ed7af69..e8bc33a 100644
|
|
|
d3c36a |
--- a/cloudinit/config/cc_keys_to_console.py
|
|
|
d3c36a |
+++ b/cloudinit/config/cc_keys_to_console.py
|
|
|
d3c36a |
@@ -26,7 +26,7 @@ from cloudinit import util
|
|
|
d3c36a |
frequency = PER_INSTANCE
|
|
|
d3c36a |
|
|
|
d3c36a |
# This is a tool that cloud init provides
|
|
|
d3c36a |
-HELPER_TOOL = '/usr/lib/cloud-init/write-ssh-key-fingerprints'
|
|
|
d3c36a |
+HELPER_TOOL = '/usr/libexec/cloud-init/write-ssh-key-fingerprints'
|
|
|
d3c36a |
|
|
|
d3c36a |
|
|
|
d3c36a |
def handle(name, cfg, _cloud, log, _args):
|
|
|
d3c36a |
diff --git a/setup.py b/setup.py
|
|
|
d3c36a |
index 9118e5f..9eb83aa 100755
|
|
|
d3c36a |
--- a/setup.py
|
|
|
d3c36a |
+++ b/setup.py
|
|
|
d3c36a |
@@ -45,7 +45,7 @@ INITSYS_FILES = {
|
|
|
d3c36a |
INITSYS_ROOTS = {
|
|
|
d3c36a |
'sysvinit': '/etc/rc.d/init.d',
|
|
|
d3c36a |
'sysvinit_deb': '/etc/init.d',
|
|
|
d3c36a |
- 'systemd': '/etc/systemd/system/',
|
|
|
d3c36a |
+ 'systemd': '/usr/lib/systemd/system/',
|
|
|
d3c36a |
'upstart': '/etc/init/',
|
|
|
d3c36a |
}
|
|
|
d3c36a |
INITSYS_TYPES = sorted(list(INITSYS_ROOTS.keys()))
|
|
|
d3c36a |
@@ -123,7 +123,7 @@ setuptools.setup(name='cloud-init',
|
|
|
d3c36a |
('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
|
|
|
d3c36a |
('/etc/cloud/templates', glob('templates/*')),
|
|
|
d3c36a |
('/usr/share/cloud-init', []),
|
|
|
d3c36a |
- ('/usr/lib/cloud-init',
|
|
|
d3c36a |
+ ('/usr/libexec/cloud-init',
|
|
|
d3c36a |
['tools/uncloud-init',
|
|
|
d3c36a |
'tools/write-ssh-key-fingerprints']),
|
|
|
d3c36a |
('/usr/share/doc/cloud-init',
|