summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-20 16:05:10 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-20 16:05:10 -0300
commitc0572dd9e06cd2775348d910433e43b42e05cbb7 (patch)
treefce07be51948d73c8eda6c7966178a61196568af
parent52054730687efbd08efa1d36e30074d789ae2d08 (diff)
parent2bb48366937bf0d5191be954ea21c671c3722d04 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/4633-fix-resolvconf-usage' into develop
-rw-r--r--changes/bug-4633_fix-resolvconf-usage1
-rwxr-xr-xpkg/linux/resolv-update6
2 files changed, 4 insertions, 3 deletions
diff --git a/changes/bug-4633_fix-resolvconf-usage b/changes/bug-4633_fix-resolvconf-usage
new file mode 100644
index 00000000..de40d03a
--- /dev/null
+++ b/changes/bug-4633_fix-resolvconf-usage
@@ -0,0 +1 @@
+- Correct resolvconf usage. Avoids permanent break of resolv.conf. Closes #4633.
diff --git a/pkg/linux/resolv-update b/pkg/linux/resolv-update
index 601d3bd2..c308b788 100755
--- a/pkg/linux/resolv-update
+++ b/pkg/linux/resolv-update
@@ -70,7 +70,7 @@ SETVAR
R="${R}nameserver $NS
"
done
- mv /etc/resolv.conf /etc/resolv.conf.bak
+ cp /etc/resolv.conf /etc/resolv.conf.bak
echo "$comment
$custom_head
$R
@@ -79,8 +79,8 @@ $custom_tail" > /etc/resolv.conf
function down() {
if [ -f /etc/resolv.conf.bak ] ; then
- unlink /etc/resolv.conf
- mv /etc/resolv.conf.bak /etc/resolv.conf
+ cat /etc/resolv.conf.bak > /etc/resolv.conf
+ rm /etc/resolv.conf.bak
fi
}