From d65a68baa233b2dbd92b594466cfc7a691fad6fb Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Sun, 16 Feb 2014 20:05:52 +0000
Subject: [PATCH 1/2] Allow overriding existing init.d script in CentOS. Fixes
 #259.

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 1e6e4d5..2079869 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2028,7 +2028,7 @@ install_centos_git_post() {
                 copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart /etc/init/salt-$fname.conf
             fi
         # Still in SysV init?!
-        elif [ ! -f /etc/init.d/salt-$fname ]; then
+        elif [ ! -f /etc/init.d/salt-$fname ] || ([ -f /etc/init.d/salt-$fname ] && [ $_FORCE_OVERWRITE -eq $BS_TRUE ]); then
             copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname} /etc/init.d/
             chmod +x /etc/init.d/salt-${fname}
             /sbin/chkconfig salt-${fname} on

From a92564ba29431bc9b8fa5c53db4c4326d8beaa3b Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Sun, 16 Feb 2014 20:07:59 +0000
Subject: [PATCH 2/2] Update changes log

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 02335f0..7cffe37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ Version 1.5.12:
 		* FreeBSD `fetch` now has a notion of insecure certificates. Handle this properly. Thank 
 		You Mike Carlson(m87carlson).
 		* Arch, openSUSE and SuSE are now upgradable when the `-U` flag is passed.
+		* Force overwrites now works for existing init.d scripts on CentOS git installations. #259
 	* Distro Support Added:
 		* FreeBSD 10 is now also supported. Thank You Mike Carlson(m87carlson).
 		* Red Had Enterprise Workstation is now supported.