github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Do not try to change /etc/resolv.conf

Browse Source 
The filesystem is supposed to be immutable, so do not try to make
a symlink; new versions of moby tool should add one anyway. But
try to make the directory a symlink points to, assuming that it
will be on a writeable filesystem.

fix #1920
see also #2288

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-07-25 15:12:40 +01:00
parent cfbdb93919
commit a81d2deb61
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/init/bin/rc.init
View File

@ -98,10 +98,8 @@ ip addr add 127.0.0.1/8 dev lo brd + scope host
ip route add 127.0.0.0/8 dev lo scope host ip route add 127.0.0.0/8 dev lo scope host
ip link set lo up ip link set lo up
# for containerising dhcpcd and other containers that need writable etc # for containerizing dhcpcd and other containers that need writable /etc/resolv.conf
mkdir /tmp/etc [ -L /etc/resolv.conf ] && mkdir -p $(dirname $(readlink -n /etc/resolv.conf))
mv /etc/resolv.conf /tmp/etc/resolv.conf
ln -snf /tmp/etc/resolv.conf /etc/resolv.conf
# remount rootfs as readonly # remount rootfs as readonly
mount -o remount,ro / mount -o remount,ro /