[docker-registry] docker-registry settings in /etc/sysconfig/docker-registry not honored

[Marek Goldmann]

commit db260f7c6c674dca531daa269ea976cc5e2bc152
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Mon Apr 7 15:16:39 2014 +0200

    docker-registry settings in /etc/sysconfig/docker-registry not honored
    
    Fixes RHBZ#1072523

 docker-registry.spec     |    6 +++++-
 docker-registry.sysvinit |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/docker-registry.spec b/docker-registry.spec
index 7a200b8..697b7b1 100644
--- a/docker-registry.spec
+++ b/docker-registry.spec
@@ -11,7 +11,7 @@
 Summary:        Registry server for Docker
 Name:           docker-registry
 Version:        0.6.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        ASL 2.0
 URL:            https://github.com/dotcloud/docker-registry
 Source:         https://github.com/dotcloud/docker-registry/archive/%{commit}.tar.gz
@@ -156,6 +156,10 @@ fi
 %endif
 
 %changelog
+* Mon Apr 07 2014 Marek Goldmann <mgoldman at redhat.com> - 0.6.6-2
+- docker-registry settings in /etc/sysconfig/docker-registry not honored,
+  RHBZ#1072523
+
 * Thu Mar 20 2014 Marek Goldmann <mgoldman at redhat.com> - 0.6.6-1
 - Upstream release 0.6.6
 - docker-registry cannot import module jinja2, RHBZ#1077630
diff --git a/docker-registry.sysvinit b/docker-registry.sysvinit
index 04b1c4a..832a933 100644
--- a/docker-registry.sysvinit
+++ b/docker-registry.sysvinit
@@ -31,6 +31,7 @@ logfile="/var/log/$prog"
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 export DOCKER_REGISTRY_CONFIG=${DOCKER_REGISTRY_CONFIG:-"/etc/docker-registry.yml"}
+export SETTINGS_FLAVOR=${SETTINGS_FLAVOR:-"dev"}
 
 start() {
     [ -x $exec ] || exit 5