From 2812bf48947e637e4ecca26f54ee06dbfe2736a1 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Tue, 18 Aug 2015 12:39:43 +0500 Subject: [PATCH 1/2] fix the boot crash on installed system --- scripts/installer/seed-data | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/installer/seed-data b/scripts/installer/seed-data index 5199f293..61c2b49e 100755 --- a/scripts/installer/seed-data +++ b/scripts/installer/seed-data @@ -11,9 +11,9 @@ if [ -z ${BASE_DIR} ]; then exit 1 fi -mkdir -p ${BASE_DIR}/lib/rancher/conf/cloud-config.d +mkdir -p ${BASE_DIR}/var/lib/rancher/conf/cloud-config.d -cp ${CLOUD_DATA} ${BASE_DIR}/lib/rancher/conf/cloud-config.d/ +cp ${CLOUD_DATA} ${BASE_DIR}/var/lib/rancher/conf/cloud-config.d/ for f in ${FILES[@]}; do IFS=":" read s d <<< "${f}" From 6bc7397a0a0283c8e48c49243c65987645a83ab7 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Tue, 18 Aug 2015 12:49:04 +0500 Subject: [PATCH 2/2] cleanups in docker params --- os-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os-config.yml b/os-config.yml index 5e82e5cc..6dc6a3f1 100644 --- a/os-config.yml +++ b/os-config.yml @@ -37,7 +37,7 @@ rancher: - /lib/modules:/lib/modules - /lib/firmware:/lib/firmware bootstrap_docker: - args: [-d, -s, overlay, -b, none, --restart=false, -g, /var/lib/system-docker, + args: [daemon, -s, overlay, -b, none, --restart=false, -g, /var/lib/system-docker, -G, root, -H, 'unix:///var/run/system-docker.sock', --userland-proxy=false] cloud_init: datasources: