git://git.onelab.eu
/
myplc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag myplc-5.3-4
[myplc.git]
/
plc.d
/
dns
diff --git
a/plc.d/dns
b/plc.d/dns
index
dd4ef7c
..
afdf55f
100755
(executable)
--- a/
plc.d/dns
+++ b/
plc.d/dns
@@
-1,6
+1,6
@@
#!/bin/bash
#
#!/bin/bash
#
-# priority:
8
50
+# priority:
9
50
#
# Start local DNS server to provide minimal DNS forward resolution for
# ourselves and our nodes.
#
# Start local DNS server to provide minimal DNS forward resolution for
# ourselves and our nodes.
@@
-8,14
+8,12
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
-#
# Source function library and configuration
. /etc/plc.d/functions
. /etc/planetlab/plc_config
# Source function library and configuration
. /etc/plc.d/functions
. /etc/planetlab/plc_config
-SIGNATURE="; generated by /etc/plc.d/dns --- DO NOT REMOVE THIS TEXT
!
"
+SIGNATURE="; generated by /etc/plc.d/dns --- DO NOT REMOVE THIS TEXT"
# Be verbose
set -x
# Be verbose
set -x
@@
-78,14
+76,12
@@
case "$1" in
MESSAGE=$"Removing /etc/plc_hosts"
dialog "$MESSAGE"
[ -f "/etc/plc_hosts" ] && rm -f /etc/plc_hosts
MESSAGE=$"Removing /etc/plc_hosts"
dialog "$MESSAGE"
[ -f "/etc/plc_hosts" ] && rm -f /etc/plc_hosts
- check
result ""
fi
if [ $PLC_DNS_ENABLED -eq 0 -a -f "/etc/resolv_plc.backup" ] ; then
MESSAGE="Restoring /etc/resolv.conf"
result ""
fi
if [ $PLC_DNS_ENABLED -eq 0 -a -f "/etc/resolv_plc.backup" ] ; then
MESSAGE="Restoring /etc/resolv.conf"
- mv -f /etc/resolv_plc.backup /etc/resolv.conf
- check
dialog "$MESSAGE"
dialog "$MESSAGE"
+ mv -f /etc/resolv_plc.backup /etc/resolv.conf
result ""
fi
result ""
fi