-
Thomas Haller authored
Until before 1.2.0, NetworkManager would always write resolv.conf as file, but if /etc/resolv.conf was a symlink, it would follow the link instead of replacing it with a file ([1], [2]). With 1.2.0, we initially dropped that behavior and added a new 'rc-manager=none' which writes resolv.conf to /var/run/NetworkManager and symlinks resolv.conf [3]. In case resolv.conf being already a symlink to another target, it would not be replaced [4]. Later, we added 'rc-manager=file', which always writes /etc/resolv.conf as file [5]. With 1.4.0, we will rename 'rc-manager=none' to 'rc-manager=symlink' [6]. This commit now fixes 'rc-manager=file' to restores the pre-1.2 behavior and follow symlinks. [1] 5761e328 [2] https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/324233 [3] 4805be2e [4] 583568e1 [5] 28879971 [6] cd6a4696 https://github.com/NetworkManager/NetworkManager/pull/7
718fd224