From 7f565b07cf7e1d05ba830d931f2d91d13b86a2e5 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Thu, 28 Jun 2012 16:32:47 -0700
Subject: Fix chopping off the wrong folers, oops

---
 packages/brpm | 9 +++++++--
 1 file 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/',
         ]
     }
-- 
cgit v1.2.3