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

Merge pull request #1027 from ibuildthecloud/foo4

Browse Source 
Make /run shared, also don't rshare in initrd
This commit is contained in:
Darren Shepherd 2016-06-17 09:37:01 -07:00 committed by GitHub
commit e058c82515
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
images/02-console/docker-init
View File

@ -20,6 +20,7 @@ for i in /opt/bin /usr/local/bin; do
done done
mount --make-shared / mount --make-shared /
mount --make-shared /run
if [ "$(grep '/var/lib/docker /var/lib/docker ' /proc/self/mountinfo | awk '{print $9}')" = "rootfs" ]; then if [ "$(grep '/var/lib/docker /var/lib/docker ' /proc/self/mountinfo | awk '{print $9}')" = "rootfs" ]; then
export DOCKER_RAMDISK=1 export DOCKER_RAMDISK=1

2
init/init.go
View File

@ -194,7 +194,7 @@ func setupSharedRoot(c *config.CloudConfig) (*config.CloudConfig, error) {
if err := mount.Mount("tmpfs", i, "tmpfs", "rw"); err != nil { if err := mount.Mount("tmpfs", i, "tmpfs", "rw"); err != nil {
return c, err return c, err
} }
if err := mount.MakeRShared(i); err != nil { if err := mount.MakeShared(i); err != nil {
return c, err return c, err
} }
} }