rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-16 23:21:19 +00:00
Code Issues Releases Wiki Activity

Fix sbin symlink and bootstrap services

Browse Source
This commit is contained in:
Darren Shepherd
2015-08-06 00:49:00 -07:00
parent cc5613c64c
commit 13106ed63f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compose/project.go
View File

@@ -76,7 +76,7 @@ func newProject(name string, cfg *config.CloudConfig) (*project.Project, error)
func addServices(p *project.Project, cfg *config.CloudConfig, enabled map[string]string, configs map[string]*project.ServiceConfig) {
// Note: we ignore errors while loading services
for name, serviceConfig := range cfg.Rancher.Services {
for name, serviceConfig := range configs {
hash := project.GetServiceHash(name, *serviceConfig)
if enabled[name] == hash {

1
scripts/mk-initrd.sh
View File

@@ -13,6 +13,7 @@ cp ${BUILD}/images.tar ${INITRD_DIR}/usr/share/ros
cp os-config.yml ${INITRD_DIR}/usr/share/ros/
cp bin/rancheros ${INITRD_DIR}/usr/bin/ros
ln -s usr/bin/ros ${INITRD_DIR}/init
ln -s bin ${INITRD_DIR}/usr/sbin
docker export $(docker create rancher/docker:1.8.0-rc2) | tar xvf - -C ${INITRD_DIR} --exclude=usr/bin/dockerlaunch \
--exclude=usr/bin/docker \