rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-01 23:17:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #424 from imikushin/fix-machine

Browse Source 
fix machine
This commit is contained in:
Ivan Mikushin 2015-07-02 21:29:48 +05:00
commit ffef51046c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init/bootstrap.go
View File

@ -77,7 +77,7 @@ outer:
"autoformat": { "autoformat": {
Net: "none", Net: "none",
Privileged: true, Privileged: true,
Image: "autoformat", Image: "rancher/os-autoformat:"+config.VERSION,
Command: project.NewCommand(format), Command: project.NewCommand(format),
Labels: project.NewSliceorMap(map[string]string{ Labels: project.NewSliceorMap(map[string]string{
config.DETACH: "false", config.DETACH: "false",

4
scripts/build-images
View File

@ -40,7 +40,7 @@ chmod +x ${INITRD_DIR}/docker #ini
ln -sf bin/rancheros ./ros ln -sf bin/rancheros ./ros
for i in $(./ros c images -i os-config.yml); do for i in $(./ros c images -i os-config.yml) rancher/os-autoformat:${VERSION}; do
docker pull ${i} docker pull ${i}
done done
docker save $(./ros c images -i os-config.yml) > ${INITRD_DIR}/images.tar #initrd2-images: /images.tar docker save $(./ros c images -i os-config.yml) rancher/os-autoformat:${VERSION} > ${INITRD_DIR}/images.tar #initrd2-images: /images.tar