Rebase against upstream rev 659
This commit is contained in:
Garrett Holmstrom
parent
5dfb161ff8
commit
b7925548d6
@ -1,34 +0,0 @@
|
||||
Index: trunk/cloudinit/distros/__init__.py
|
||||
===================================================================
|
||||
--- trunk.orig/cloudinit/distros/__init__.py
|
||||
+++ trunk/cloudinit/distros/__init__.py
|
||||
@@ -239,6 +239,7 @@ class Distro(object):
|
||||
"shell": '--shell',
|
||||
"expiredate": '--expiredate',
|
||||
"inactive": '--inactive',
|
||||
+ "selinux-user": '--selinux-user',
|
||||
}
|
||||
|
||||
adduser_opts_flags = {
|
||||
Index: trunk/doc/examples/cloud-config-user-groups.txt
|
||||
===================================================================
|
||||
--- trunk.orig/doc/examples/cloud-config-user-groups.txt
|
||||
+++ trunk/doc/examples/cloud-config-user-groups.txt
|
||||
@@ -12,6 +12,7 @@ users:
|
||||
gecos: Foo B. Bar
|
||||
primary-group: foobar
|
||||
groups: users
|
||||
+ selinux-user: staff_u
|
||||
expiredate: 2012-09-01
|
||||
ssh-import-id: foobar
|
||||
lock-passwd: false
|
||||
@@ -38,6 +39,9 @@ users:
|
||||
# primary-group: define the primary group. Defaults to a new group created
|
||||
# named after the user.
|
||||
# groups: Optional. Additional groups to add the user to. Defaults to none
|
||||
+# selinux-user: Optional. The SELinux user for the user's login, such as
|
||||
+# "staff_u". When this is omitted the system will select the default
|
||||
+# SELinux user.
|
||||
# lock-passwd: Defaults to true. Lock the password to disable password login
|
||||
# inactive: Create the user as inactive
|
||||
# passwd: The hash -- not the password itself -- of the password you want
|
||||
@ -1,13 +0,0 @@
|
||||
Index: cloud-init/cloudinit/distros/rhel.py
|
||||
===================================================================
|
||||
--- cloud-init.orig/cloudinit/distros/rhel.py
|
||||
+++ cloud-init/cloudinit/distros/rhel.py
|
||||
@@ -208,7 +208,7 @@ class Distro(distros.Distro):
|
||||
|
||||
def update_package_sources(self):
|
||||
self._runner.run("update-sources", self.package_command,
|
||||
- ["update"], freq=PER_INSTANCE)
|
||||
+ ["clean", "expire-cache"], freq=PER_INSTANCE)
|
||||
|
||||
|
||||
# This class helps adjust the configobj
|
||||
@ -1,29 +1,35 @@
|
||||
user: ec2-user
|
||||
users:
|
||||
- default
|
||||
|
||||
disable_root: 1
|
||||
ssh_pwauth: 0
|
||||
|
||||
cc_ready_cmd: ['/bin/true']
|
||||
locale_configfile: /etc/sysconfig/i18n
|
||||
mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
|
||||
ssh_deletekeys: 0
|
||||
ssh_genkeytypes: ~
|
||||
ssh_svcname: sshd
|
||||
syslog_fix_perms: ~
|
||||
|
||||
cloud_init_modules:
|
||||
- bootcmd
|
||||
- write-files
|
||||
- resizefs
|
||||
- set_hostname
|
||||
- update_hostname
|
||||
- update_etc_hosts
|
||||
- rsyslog
|
||||
- users-groups
|
||||
- ssh
|
||||
|
||||
cloud_config_modules:
|
||||
- mounts
|
||||
- ssh-import-id
|
||||
- locale
|
||||
- set-passwords
|
||||
- timezone
|
||||
- puppet
|
||||
- chef
|
||||
- salt-minion
|
||||
- mcollective
|
||||
- disable-ec2-metadata
|
||||
- runcmd
|
||||
|
||||
@ -33,8 +39,16 @@ cloud_final_modules:
|
||||
- scripts-per-boot
|
||||
- scripts-per-instance
|
||||
- scripts-user
|
||||
- ssh-authkey-fingerprints
|
||||
- keys-to-console
|
||||
- phone-home
|
||||
- final-message
|
||||
|
||||
system_info:
|
||||
distro: fedora
|
||||
paths:
|
||||
cloud_dir: /var/lib/cloud
|
||||
templates_dir: /etc/cloud/templates
|
||||
ssh_svcname: sshd
|
||||
|
||||
# vim:syntax=yaml
|
||||
|
||||
@ -2,23 +2,17 @@
|
||||
|
||||
Name: cloud-init
|
||||
Version: 0.7.0
|
||||
Release: 0.1.bzr650%{?dist}
|
||||
Release: 0.2.bzr659%{?dist}
|
||||
Summary: Cloud instance init scripts
|
||||
|
||||
Group: System Environment/Base
|
||||
License: GPLv3
|
||||
URL: http://launchpad.net/cloud-init
|
||||
# bzr export -r 650 cloud-init-0.7.0-bzr650.tar.gz lp:cloud-init
|
||||
Source0: %{name}-%{version}-bzr650.tar.gz
|
||||
# bzr export -r 659 cloud-init-0.7.0-bzr659.tar.gz lp:cloud-init
|
||||
Source0: %{name}-%{version}-bzr659.tar.gz
|
||||
Source1: cloud-init-fedora.cfg
|
||||
Source2: cloud-init-README.fedora
|
||||
Patch0: cloud-init-0.7.0-fedora.patch
|
||||
# Make update_package_sources stop upgrading packages
|
||||
# https://code.launchpad.net/~gholms/cloud-init/yum-clean/+merge/125001
|
||||
Patch1: cloud-init-0.7.0-yum-clean.patch
|
||||
# Add support for useradd --selinux-user
|
||||
# https://code.launchpad.net/~gholms/cloud-init/useradd-selinux/+merge/124998
|
||||
Patch2: cloud-init-0.7.0-useradd-selinux.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -52,10 +46,8 @@ ssh keys and to let the user run various scripts.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}-bzr650
|
||||
%setup -q -n %{name}-%{version}-bzr659
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
cp -p %{SOURCE2} README.fedora
|
||||
|
||||
@ -133,6 +125,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Sep 22 2012 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.0-0.2.bzr659
|
||||
- Rebased against upstream rev 659
|
||||
|
||||
* Mon Sep 17 2012 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.0-0.1.bzr650
|
||||
- Rebased against upstream rev 650
|
||||
- Added support for useradd --selinux-user
|
||||
|
||||
Loading…
Reference in New Issue
Block a user