gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-03-27 22:43:33 +01:00
Code Issues Projects Releases Wiki Activity

Correctly handle the case where resolv.conf is a symlink (Debian: #691973)

Browse Source
This commit is contained in:
David Paleino
2012-10-31 23:35:10 +01:00
parent 3baf6df9c9
commit ad8fab20d2
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wicd/wicd-daemon.py
View File

@@ -1748,7 +1748,11 @@ def main(argv):
# don't back up if .orig exists, probably there cause # don't back up if .orig exists, probably there cause
# wicd exploded # wicd exploded
if not os.path.exists(backup_location): if not os.path.exists(backup_location):
shutil.copy2('/etc/resolv.conf', backup_location) if os.path.islink('/etc/resolv.conf'):
dest = os.readlink('/etc/resolv.conf')
os.symlink(dest, backup_location)
else:
shutil.copy2('/etc/resolv.conf', backup_location)
os.chmod(backup_location, 0644) os.chmod(backup_location, 0644)
except IOError: except IOError:
print 'error backing up resolv.conf' print 'error backing up resolv.conf'
@@ -1795,7 +1799,12 @@ def main(argv):
# restore resolv.conf on quit # restore resolv.conf on quit
try: try:
shutil.move(wpath.varlib + 'resolv.conf.orig', '/etc/resolv.conf') backup_location = wpath.varlib + 'resolv.conf.orig'
if os.path.islink(backup_location):
dest = os.readlink(backup_location)
os.symlink(dest, '/etc/resolv.conf')
else:
shutil.move(backup_location, '/etc/resolv.conf')
os.chmod('/etc/resolv.conf', 0644) os.chmod('/etc/resolv.conf', 0644)
except IOError: except IOError:
print 'error restoring resolv.conf' print 'error restoring resolv.conf'