diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-05-21 08:52:57 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-05-21 08:52:57 -0300 |
| commit | 415b6e1f58e41ba0b66c24b6a1e93aca039a5e9f (patch) | |
| tree | a5fecfaeda0f705e749de54d9c6c3bb388e5de74 | |
| parent | 8448a42c81da482063233da48dc66a5ddcf7d13d (diff) | |
| parent | 73801e0db2601301f06d388fa7e258eccf093373 (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/feature/fix-nameserver-restoring' into develop
| -rw-r--r-- | changes/feature_5692-fix-nameserver-restoring | 1 | ||||
| -rwxr-xr-x | pkg/linux/bitmask-root | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/feature_5692-fix-nameserver-restoring b/changes/feature_5692-fix-nameserver-restoring new file mode 100644 index 00000000..10ce3427 --- /dev/null +++ b/changes/feature_5692-fix-nameserver-restoring @@ -0,0 +1 @@ +- Fix nameserver restoring. Closes: #5692 diff --git a/pkg/linux/bitmask-root b/pkg/linux/bitmask-root index 136fd6a4..6badeedd 100755 --- a/pkg/linux/bitmask-root +++ b/pkg/linux/bitmask-root @@ -566,7 +566,7 @@ class NameserverRestorer(Daemon): A daemon that will restore the previous nameservers. """ - def run(self): + def run(self, *args): """ Run when daemonized. """ |