[packages/docker] add sysconfig file

glen glen at pld-linux.org
Wed May 27 23:26:15 CEST 2015


commit 62b620a78bb585eafe4bc88a9a7996a9372b29bc
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 28 00:25:56 2015 +0300

    add sysconfig file

 docker.init      | 2 +-
 docker.spec      | 7 +++++--
 docker.sysconfig | 7 +++++++
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/docker.spec b/docker.spec
index b8be74e..5521051 100644
--- a/docker.spec
+++ b/docker.spec
@@ -12,6 +12,7 @@ Source0:	https://github.com/docker/docker/archive/v%{version}/%{name}-%{version}
 # Source0-md5:	3fdcb25a498961f6eb14a9c1d81e9244
 Source5:	%{name}.service
 Source6:	%{name}.init
+Source7:	%{name}.sysconfig
 URL:		https://github.com/docker/docker
 BuildRequires:	btrfs-progs-devel
 BuildRequires:	device-mapper-devel
@@ -109,13 +110,14 @@ DEBUG=1 hack/make.sh dynbinary
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/rc.d/init.d,%{systemdunitdir}} \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/{rc.d/init.d,sysconfig},%{systemdunitdir}} \
 	$RPM_BUILD_ROOT/var/lib/docker/{aufs,containers,execdriver,graph,init,tmp,trust,vfs,volumes}
 
 install -p bundles/%{version}/dynbinary/docker-%{version} $RPM_BUILD_ROOT%{_bindir}/docker
 install -p bundles/%{version}/dynbinary/dockerinit-%{version} $RPM_BUILD_ROOT%{_bindir}/dockerinit
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker
+cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/docker
 #cp -p packaging/debian/lxc-docker.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 # install udev rules
@@ -155,10 +157,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md CHANGELOG.md CONTRIBUTING.md LICENSE AUTHORS NOTICE MAINTAINERS
-%{systemdunitdir}/docker.service
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/docker
 %attr(754,root,root) /etc/rc.d/init.d/docker
 %attr(755,root,root) %{_bindir}/docker
 %attr(755,root,root) %{_bindir}/dockerinit
+%{systemdunitdir}/docker.service
 /lib/udev/rules.d/80-docker.rules
 #%{_mandir}/man1/lxc-docker.1*
 
diff --git a/docker.init b/docker.init
index 10c66db..7a1a6d3 100755
--- a/docker.init
+++ b/docker.init
@@ -41,7 +41,7 @@ start() {
 	fi
 
 	msg_starting "Docker"
-	daemon --fork /usr/bin/docker -d
+	daemon --fork /usr/bin/docker -d $OPTIONS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/docker
 }
diff --git a/docker.sysconfig b/docker.sysconfig
new file mode 100644
index 0000000..f49dc8a
--- /dev/null
+++ b/docker.sysconfig
@@ -0,0 +1,7 @@
+# Customized settings for Docker
+
+# Define nice level for docker
+SERVICE_RUN_NICE_LEVEL="+0"
+
+# Modify these options if you want to change the way the docker daemon runs
+#OPTIONS=""
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/docker.git/commitdiff/62b620a78bb585eafe4bc88a9a7996a9372b29bc



More information about the pld-cvs-commit mailing list