setup.py: rename "daemon type" to "init system"

This brings with it other changes, and also makes an install
install all of the requisite init files. (ie, cloud-init needs the -local and
the non-local)

4 files changed, 5 insertions, 5 deletions

diff --git a/packages/bddeb b/packages/bddeb
index b5a70dd8..10ad08b3 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -29,7 +29,7 @@ PKG_MP = {
 }
 
 
-def write_debian_folder(root, version, revno, daemon_type):
+def write_debian_folder(root, version, revno, init_sys):
     deb_dir = util.abs_join(root, 'debian')
     os.makedirs(deb_dir)
     
@@ -67,7 +67,7 @@ def write_debian_folder(root, version, revno, daemon_type):
     
     templater.render_to_file(util.abs_join('debian', 'rules'),
                              util.abs_join(deb_dir, 'rules'),
-                             params={'daemon_type': daemon_type})
+                             params={'init_sys': init_sys})
     
     # Just copy the following directly
     for base_fn in ['dirs', 'copyright', 'compat', 'pycompat']:
diff --git a/packages/brpm b/packages/brpm
index 1212b0e4..1d05bd2a 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -150,7 +150,7 @@ def generate_spec_contents(args, tmpl_fn):
     else:
         subs['systemd'] = False
 
-    subs['daemon_type'] = args.boot
+    subs['init_sys'] = args.boot
     return templater.render_from_file(tmpl_fn, params=subs)
 
 
diff --git a/packages/debian/rules b/packages/debian/rules
index 6814974f..87cd6538 100755
--- a/packages/debian/rules
+++ b/packages/debian/rules
@@ -7,7 +7,7 @@ binary-install/cloud-init::cloud-init-fixups
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-DEB_PYTHON_INSTALL_ARGS_ALL += --daemon-type={{daemon_type}}
+DEB_PYTHON_INSTALL_ARGS_ALL += --init-system={{init_sys}}
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
diff --git a/packages/redhat/cloud-init.spec b/packages/redhat/cloud-init.spec
index df13bcb7..d0f83a4b 100644
--- a/packages/redhat/cloud-init.spec
+++ b/packages/redhat/cloud-init.spec
@@ -63,7 +63,7 @@ ssh keys and to let the user run various scripts.
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 \
             --skip-build --root $RPM_BUILD_ROOT \
-            --daemon-type={{daemon_type}}
+            --init-system={{init_sys}}
 
 # Note that /etc/rsyslog.d didn't exist by default until F15.
 # el6 request: https://bugzilla.redhat.com/show_bug.cgi?id=740420