rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity
5e3db3da62
cloud-init/cloud-init-0.7.2-fedora.patch

34 lines
1.4 KiB
Diff
Raw Normal View History

update to upstream revision 809 to fix various issues The most major problem is that it no longer seems possible to define a user via the user-defined cloud-config data and have that user get an SSH authorized_keys correctly installed, when the SSH key comes from the Ec2 datasource. This is a regression from the version shipped in F17 AFAICS, and it's fixed upstream[1]. There are a number of other F18 related fixes upstream which would be valuable, including: - Improved hostname handling (doesn't truncate hostnames containing ".")[2] - Fedora locale, hostname and tz related fixes[3] - Fedora systemd, blkid and sysconfig fixes (rev 809)[3] [1] https://bugs.launchpad.net/cloud-init/+bug/1100920 [2] https://bugs.launchpad.net/heat/+bug/1164400 [3] http://bazaar.launchpad.net/~gpadgett/cloud-init/ovirt/revision/802
2013-05-02 16:48:40 +00:00
diff -uNr cloud-init.orig/cloudinit/config/cc_keys_to_console.py cloud-init/cloudinit/config/cc_keys_to_console.py
--- cloud-init.orig/cloudinit/config/cc_keys_to_console.py 2013-04-12 14:03:11.049761648 +0100
+++ cloud-init/cloudinit/config/cc_keys_to_console.py 2013-04-12 14:13:09.660280218 +0100
@@ -26,7 +26,7 @@
Rebase against upstream rev 650
2012-09-17 17:09:31 +00:00
frequency = PER_INSTANCE
# This is a tool that cloud init provides
-HELPER_TOOL = '/usr/lib/cloud-init/write-ssh-key-fingerprints'
+HELPER_TOOL = '/usr/libexec/cloud-init/write-ssh-key-fingerprints'
def handle(name, cfg, _cloud, log, _args):
update to upstream revision 809 to fix various issues The most major problem is that it no longer seems possible to define a user via the user-defined cloud-config data and have that user get an SSH authorized_keys correctly installed, when the SSH key comes from the Ec2 datasource. This is a regression from the version shipped in F17 AFAICS, and it's fixed upstream[1]. There are a number of other F18 related fixes upstream which would be valuable, including: - Improved hostname handling (doesn't truncate hostnames containing ".")[2] - Fedora locale, hostname and tz related fixes[3] - Fedora systemd, blkid and sysconfig fixes (rev 809)[3] [1] https://bugs.launchpad.net/cloud-init/+bug/1100920 [2] https://bugs.launchpad.net/heat/+bug/1164400 [3] http://bazaar.launchpad.net/~gpadgett/cloud-init/ovirt/revision/802
2013-05-02 16:48:40 +00:00
diff -uNr cloud-init.orig/setup.py cloud-init/setup.py
--- cloud-init.orig/setup.py 2013-04-12 14:03:11.052761671 +0100
+++ cloud-init/setup.py 2013-04-12 14:08:12.828042068 +0100
@@ -45,7 +45,7 @@
Rebase against upstream rev 650
2012-09-17 17:09:31 +00:00
INITSYS_ROOTS = {
'sysvinit': '/etc/rc.d/init.d',
update to upstream revision 809 to fix various issues The most major problem is that it no longer seems possible to define a user via the user-defined cloud-config data and have that user get an SSH authorized_keys correctly installed, when the SSH key comes from the Ec2 datasource. This is a regression from the version shipped in F17 AFAICS, and it's fixed upstream[1]. There are a number of other F18 related fixes upstream which would be valuable, including: - Improved hostname handling (doesn't truncate hostnames containing ".")[2] - Fedora locale, hostname and tz related fixes[3] - Fedora systemd, blkid and sysconfig fixes (rev 809)[3] [1] https://bugs.launchpad.net/cloud-init/+bug/1100920 [2] https://bugs.launchpad.net/heat/+bug/1164400 [3] http://bazaar.launchpad.net/~gpadgett/cloud-init/ovirt/revision/802
2013-05-02 16:48:40 +00:00
'sysvinit_deb': '/etc/init.d',
Rebase against upstream rev 650
2012-09-17 17:09:31 +00:00
- 'systemd': '/etc/systemd/system/',
+ 'systemd': '/usr/lib/systemd/system/',
'upstart': '/etc/init/',
}
INITSYS_TYPES = sorted(list(INITSYS_ROOTS.keys()))
update to upstream revision 809 to fix various issues The most major problem is that it no longer seems possible to define a user via the user-defined cloud-config data and have that user get an SSH authorized_keys correctly installed, when the SSH key comes from the Ec2 datasource. This is a regression from the version shipped in F17 AFAICS, and it's fixed upstream[1]. There are a number of other F18 related fixes upstream which would be valuable, including: - Improved hostname handling (doesn't truncate hostnames containing ".")[2] - Fedora locale, hostname and tz related fixes[3] - Fedora systemd, blkid and sysconfig fixes (rev 809)[3] [1] https://bugs.launchpad.net/cloud-init/+bug/1100920 [2] https://bugs.launchpad.net/heat/+bug/1164400 [3] http://bazaar.launchpad.net/~gpadgett/cloud-init/ovirt/revision/802
2013-05-02 16:48:40 +00:00
@@ -123,7 +123,7 @@
Rebase against upstream rev 650
2012-09-17 17:09:31 +00:00
('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
('/etc/cloud/templates', glob('templates/*')),
('/usr/share/cloud-init', []),
- ('/usr/lib/cloud-init',
+ ('/usr/libexec/cloud-init',
['tools/uncloud-init',
'tools/write-ssh-key-fingerprints']),
('/usr/share/doc/cloud-init',
Reference in New Issue Copy Permalink