diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-07-16 14:16:29 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-07-16 14:16:29 -0700 |
| commit | 3633af335f8273ac0ddc8f9cffedbcfa9d69cb44 (patch) | |
| tree | 19cd5746b4b25e2a7f81e80128fe21e844702361 /templates/system/name-server | |
| parent | 325cfa1ed8dfe41aaf393bdf04f38c6b392f7994 (diff) | |
| parent | f7f94359f2fccaed84b8c73c1ab743450348eb75 (diff) | |
| download | vyatta-cfg-system-3633af335f8273ac0ddc8f9cffedbcfa9d69cb44.tar.gz vyatta-cfg-system-3633af335f8273ac0ddc8f9cffedbcfa9d69cb44.zip | |
Merge branch 'hollywood' into islavista
Diffstat (limited to 'templates/system/name-server')
| -rw-r--r-- | templates/system/name-server/node.def | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/templates/system/name-server/node.def b/templates/system/name-server/node.def index 0ed43351..3866e82c 100644 --- a/templates/system/name-server/node.def +++ b/templates/system/name-server/node.def @@ -5,7 +5,9 @@ update:expression: "sudo sh -c \"touch /etc/resolv.conf && \ if grep -q '$VAR(@)' /etc/resolv.conf; then \ exit 0; \ else \ - echo \\\"nameserver\t $VAR(@)\\\" >> /etc/resolv.conf; \ + mv -f /etc/resolv.conf /etc/old_resolv.conf && \ + echo \\\"nameserver\t $VAR(@)\\\" >> /etc/resolv.conf && \ + cat /etc/old_resolv.conf >> /etc/resolv.conf; \ fi && \ if [ -f /etc/ntp.conf ] && grep -q 'server' /etc/ntp.conf; then \ /usr/sbin/invoke-rc.d ntp restart >&/dev/null; \ |