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

Note the os-release file that system-docker wants is lost

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-07-11 21:12:48 +10:00
parent 47261eab01
commit 43c620c4d8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
init/init.go
View File

@@ -439,12 +439,10 @@ func enableHypervisorService(hypervisorName string) {
cfg := config.LoadConfig()
if service.ValidService(serviceName, cfg) {
log.Infof("Setting rancher.services_include. %s=true", serviceName)
log.Debugf("SVEN Setting rancher.services_include. %s=true", serviceName)
if err := config.Set("rancher.services_include."+serviceName, "true"); err != nil {
log.Error(err)
}
} else {
log.Infof("SVEN Skipping %s, can't get %s.yml file", serviceName, serviceName)
log.Debugf("SVEN Skipping %s, can't get %s.yml file", serviceName, serviceName)
log.Infof("Skipping %s, can't get %s.yml file", serviceName, serviceName)
}
}

2
scripts/global.cfg
View File

@@ -1 +1 @@
APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 console=tty0 rancher.autologin=ttyS1 printk.devkmsg=on ${APPEND}
APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 console=tty0 console=ttyS0 console=ttyS1 printk.devkmsg=on ${APPEND}

4
scripts/layout
View File

@@ -11,7 +11,7 @@ INITRD_DIR=${BUILD}/initrd
echo Create initrd layout in $INITRD_DIR
rm -rf ${INITRD_DIR}
mkdir -p ${INITRD_DIR}/usr/{etc,bin,share/ros,var/lib/cni/bin}
mkdir -p ${INITRD_DIR}/usr/{etc,lib,bin,share/ros,var/lib/cni/bin}
./scripts/template
@@ -39,6 +39,8 @@ SUPPORT_URL="https://forums.rancher.com/c/rancher-os"
BUG_REPORT_URL="https://github.com/rancher/os/issues"
BUILD_ID=
HERE
# TODO: usr/lib dir is overwritten by the kernel modules and firmware
ln -s ../share/ros/os-release ${INITRD_DIR}/usr/lib/
# Support upgrades from old persistent consoles that bind mount these
touch ${INITRD_DIR}/usr/bin/docker-containerd