From 43c22fcffa0a630eaef3d0209a97efd95de34ddf Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 8 Apr 2016 14:03:43 +0100 Subject: [PATCH] change find to use keys, fix /etc/docker copying using find Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 6 +++++- alpine/packages/mobyconfig/mobyconfig | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 948268555..ade7423b9 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -40,7 +40,11 @@ start() if mobyconfig exists etc/docker 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 if mobyconfig exists network then diff --git a/alpine/packages/mobyconfig/mobyconfig b/alpine/packages/mobyconfig/mobyconfig index 2c9dbe4e2..36a4d6c53 100755 --- a/alpine/packages/mobyconfig/mobyconfig +++ b/alpine/packages/mobyconfig/mobyconfig @@ -73,7 +73,7 @@ if [ $1 == "find" ] then if [ -e ${BASE}/${KEY} ] then - find ${BASE}/${KEY} -type f + find ${BASE}/${KEY} -type f | sed "s@^${BASE}@@g" exit 0 else printf "No such key: ${KEY}\n" 1>&2