rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-16 16:11:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #506 from imikushin/fix-installed-crash

Browse Source 
fix the boot crash on installed system
This commit is contained in:
Darren Shepherd 2015-08-18 10:54:00 -07:00
commit b0fb2ff875
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os-config.yml
View File

@ -37,7 +37,7 @@ rancher:
- /lib/modules:/lib/modules - /lib/modules:/lib/modules
- /lib/firmware:/lib/firmware - /lib/firmware:/lib/firmware
bootstrap_docker: 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] -G, root, -H, 'unix:///var/run/system-docker.sock', --userland-proxy=false]
cloud_init: cloud_init:
datasources: datasources:

4
scripts/installer/seed-data
View File

@ -11,9 +11,9 @@ if [ -z ${BASE_DIR} ]; then
exit 1 exit 1
fi 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 for f in ${FILES[@]}; do
IFS=":" read s d <<< "${f}" IFS=":" read s d <<< "${f}"