merge from 0.7.9 at 0.7.9

3 files changed, 21 insertions, 4 deletions

diff --git a/packages/debian/copyright b/packages/debian/copyright
index c694f30d..c9c7d231 100644
--- a/packages/debian/copyright
+++ b/packages/debian/copyright
@@ -12,6 +12,7 @@ Upstream Author: Scott Moser <smoser@canonical.com>
     Chuck Short <chuck.short@canonical.com>
 
 Copyright: 2010, Canonical Ltd. 
+License: GPL-3 or Apache-2.0
 License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 3, as
@@ -27,3 +28,18 @@ License: GPL-3
 
  The complete text of the GPL version 3 can be seen in
  /usr/share/common-licenses/GPL-3.
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+    http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index d0ae048f..fd3cf938 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -11,7 +11,7 @@ Release:        1${subrelease}%{?dist}
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
-License:        GPLv3
+License:        Dual-licesed GPLv3 or Apache 2.0
 URL:            http://launchpad.net/cloud-init
 
 Source0:        ${archive_name}
@@ -171,10 +171,11 @@ fi
 %{_unitdir}/cloud-*
 #end if
 
+%{_sysconfdir}/NetworkManager/dispatcher.d/hook-network-manager
+%{_sysconfdir}/dhcp/dhclient-exit-hooks.d/hook-dhclient
+
 # Program binaries
 %{_bindir}/cloud-init*
-%{_libexecdir}/%{name}/uncloud-init
-%{_libexecdir}/%{name}/write-ssh-key-fingerprints
 
 # Docs
 %doc LICENSE ChangeLog TODO.rst requirements.txt
diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in
index f994a0cf..6ce0be8c 100644
--- a/packages/suse/cloud-init.spec.in
+++ b/packages/suse/cloud-init.spec.in
@@ -10,7 +10,7 @@ Release:        1${subrelease}%{?dist}
 Summary:        Cloud instance init scripts
 
 Group:          System/Management
-License:        GPLv3
+License:        Dual licensed GPLv3 or Apache 2.0
 URL:            http://launchpad.net/cloud-init
 
 Source0:        ${archive_name}