From 9beee47b0f32fbd753d5959065ed620bec93f8bd Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Jul 22 2015 17:01:03 +0000
Subject: d-s-s sysconfig changes


NVR: docker-1.7.1-4.gitcc60fc3

- revert original d-s-s config location
- d-s-s config in /etc/sysconfig is empty by default

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

---

diff --git a/.gitignore b/.gitignore
index 1eb9513..9eb3194 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /docker-storage-setup-7cf73dd.tar.gz
 /docker-b6416b7.tar.gz
 /docker-cc60fc3.tar.gz
+/docker-storage-setup-b152398.tar.gz
diff --git a/docker.spec b/docker.spec
index 8e2e8c4..55fc7c6 100644
--- a/docker.spec
+++ b/docker.spec
@@ -19,7 +19,8 @@
 %global d_shortcommit %(c=%{d_commit}; echo ${c:0:7})
 
 # d-s-s stuff (prefix with dss_)
-%global dss_commit 7cf73ddeebff0e93ffebf4e31dbde3907db6d958
+%global dss_libdir %{_prefix}/lib/%{repo}-storage-setup
+%global dss_commit b15239869d789e86a279edae5479fd25a988bf78
 %global dss_shortcommit %(c=%{dss_commit}; echo ${c:0:7})
 
 #%global tar_import_path code.google.com/p/go/src/pkg/archive/tar
@@ -52,7 +53,7 @@
 
 Name: %{repo}
 Version: 1.7.1
-Release: 3.git%{d_shortcommit}%{?dist}
+Release: 4.git%{d_shortcommit}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: http://www.%{repo}.com
@@ -443,8 +444,10 @@ install -d %{buildroot}%{_bindir}
 install -p -m 755 %{repo}-storage-setup.sh %{buildroot}%{_bindir}/%{repo}-storage-setup
 install -d %{buildroot}%{_unitdir}
 install -p -m 644 %{repo}-storage-setup.service %{buildroot}%{_unitdir}
+install -d %{buildroot}%{dss_libdir}
+install -p -m 644 %{repo}-storage-setup.conf %{buildroot}%{dss_libdir}/%{repo}-storage-setup
 install -d %{buildroot}%{_sysconfdir}/sysconfig
-install -p -m 644 %{repo}-storage-setup.conf %{buildroot}%{_sysconfdir}/sysconfig/%{repo}-storage-setup
+install -p -m 644 %{repo}-storage-setup-override.conf %{buildroot}%{_sysconfdir}/sysconfig/%{repo}-storage-setup
 install -d %{buildroot}%{_mandir}/man1
 install -p -m 644 %{repo}-storage-setup.1 %{buildroot}%{_mandir}/man1
 popd
@@ -515,6 +518,7 @@ fi
 # d-s-s specific
 %{_unitdir}/%{repo}-storage-setup.service
 %{_bindir}/%{repo}-storage-setup
+%{dss_libdir}/%{repo}-storage-setup
 %config(noreplace) %{_sysconfdir}/sysconfig/%{repo}-storage-setup
 
 %if 0%{?with_devel}
@@ -552,6 +556,10 @@ fi
 %{_datadir}/zsh/site-functions/_%{repo}
 
 %changelog
+* Wed Jul 22 2015 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.7.1-4.gitcc60fc3
+- revert original d-s-s config location
+- d-s-s config in /etc/sysconfig is empty by default
+
 * Wed Jul 22 2015 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.7.1-3.gitcc60fc3
 - move d-s-s sysconfig file to /etc/sysconfig
 - correct previous 2 changelog dates
diff --git a/sources b/sources
index 3c13d51..1167c34 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 aefb0a4baa234f91fb4ac847c218597e  docker-cc60fc3.tar.gz
 175d1c195f62b55a66cb0f01bb6b9b84  docker-selinux-bebf349.tar.gz
-74edac1e09479614f8d0d59e5863060f  docker-storage-setup-7cf73dd.tar.gz
+5e728722f199122958231a6d4073e2ef  docker-storage-setup-b152398.tar.gz