github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-24 19:28:09 +00:00
Code Issues Projects Releases Wiki Activity

change find to use keys, fix /etc/docker copying using find

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-04-08 14:03:43 +01:00
parent dba240e1f5
commit 293a1eb23d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alpine/packages/docker/etc/init.d/docker
View File

@ -40,7 +40,11 @@ start()
if mobyconfig exists etc/docker if mobyconfig exists etc/docker
then then
cp -a $(mobyconfig find etc/docker) /etc/docker/ for f in $(mobyconfig find etc/docker)
do
mkdir -p $(dirname $f)
mobyconfig get $f > $f
done
fi fi
if mobyconfig exists network if mobyconfig exists network
then then

2
alpine/packages/mobyconfig/mobyconfig
View File

@ -73,7 +73,7 @@ if [ $1 == "find" ]
then then
if [ -e ${BASE}/${KEY} ] if [ -e ${BASE}/${KEY} ]
then then
find ${BASE}/${KEY} -type f find ${BASE}/${KEY} -type f | sed "s@^${BASE}@@g"
exit 0 exit 0
else else
printf "No such key: ${KEY}\n" 1>&2 printf "No such key: ${KEY}\n" 1>&2