summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-06-28 16:32:47 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-06-28 16:32:47 -0700
commit7f565b07cf7e1d05ba830d931f2d91d13b86a2e5 (patch)
treeda93c6e1fd7b41bcdd410b1ed88d953af91293d0 /packages
parent4b01419c139473ad368b7fca91e183ca073707c4 (diff)
downloadvyos-cloud-init-7f565b07cf7e1d05ba830d931f2d91d13b86a2e5.tar.gz
vyos-cloud-init-7f565b07cf7e1d05ba830d931f2d91d13b86a2e5.zip
Fix chopping off the wrong folers, oops
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/brpm9
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/brpm b/packages/brpm
index 44fd24b3..bbf30565 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -162,11 +162,13 @@ def generate_spec_contents(args, tmpl_fn):
boot_remove = {
'initd': [
'/etc/init.d/cloud-init-local',
+ # Remove the other auto-start folders
'/etc/systemd/',
'/etc/init/',
],
'initd-local': [
'/etc/init.d/cloud-init',
+ # Remove the other auto-start folders
'/etc/systemd/',
'/etc/init/',
],
@@ -174,18 +176,21 @@ def generate_spec_contents(args, tmpl_fn):
# all of its files being 'active' (and not have naming
# or event name conflicts??)
'systemd': [
+ # Remove the other auto-start folders
'/etc/init.d/',
'/etc/init/',
],
'upstart': [
'/etc/init/cloud-init-nonet.conf',
'/etc/init/cloud-init-local.conf',
- '/etc/init/',
+ # Remove the other auto-start folders
+ '/etc/init.d/',
'/etc/systemd/',
],
'upstart-local': [
'/etc/init/cloud-init.conf',
- '/etc/init/',
+ # Remove the other auto-start folders
+ '/etc/init.d/',
'/etc/systemd/',
]
}