diff --git a/init/init.go b/init/init.go index 6f752bdb..921b6802 100755 --- a/init/init.go +++ b/init/init.go @@ -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) } } diff --git a/scripts/global.cfg b/scripts/global.cfg index e5592660..def6e2bd 100755 --- a/scripts/global.cfg +++ b/scripts/global.cfg @@ -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} diff --git a/scripts/layout b/scripts/layout index 40d52d8a..ddfa567d 100755 --- a/scripts/layout +++ b/scripts/layout @@ -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