Add support for not adding the current system hostname

Author: Pandapip1

makeHosts.py

@@ -67,10 +67,10 @@ def recursively_loop_extensions(extension, extensions, current_extensions):
 
     name = "-".join(c_current_extensions)
 
-    params = ("-a", "-n", "-o", "alternates/"+name, "-e") + tuple(c_current_extensions)
+    params = ("-a", "-d", "-n", "-o", "alternates/"+name, "-e") + tuple(c_current_extensions)
     update_hosts_file(*params)
 
-    params = ("-a", "-n", "-s", "--nounifiedhosts", "-o", "alternates/"+name+"-only", "-e") + tuple(c_current_extensions)
+    params = ("-a", "-d", "-n", "-s", "--nounifiedhosts", "-o", "alternates/"+name+"-only", "-e") + tuple(c_current_extensions)
     update_hosts_file(*params)
 
     while len(c_extensions) > 0:
@@ -96,9 +96,9 @@ def main():
 
     # Update the unified hosts file
     if options["noupdate"]:
-        update_hosts_file("-a", "-n")
+        update_hosts_file("-a", "-d", "-n")
     else:
-        update_hosts_file("-a")
+        update_hosts_file("-a", "-d")
 
     # List of extensions we want to generate, we will loop over them recursively to prevent manual definitions
     # Only add new extensions to the end of the array, to avoid relocating existing hosts-files

testUpdateHostsFile.py

@@ -131,6 +131,7 @@ def test_get_defaults(self):
                 "commonexclusions": ["hulu.com"],
                 "blacklistfile": "foo" + self.sep + "blacklist",
                 "whitelistfile": "foo" + self.sep + "whitelist",
+                "addsystemhostname": True,
             }
             self.assertDictEqual(actual, expected)
 
@@ -1092,7 +1093,7 @@ def test_basic_include_static_hosts(self):
 
     def test_basic_include_static_hosts_linux(self):
         kwargs = dict(
-            extensions="", outputsubfolder="", numberofrules=5, skipstatichosts=False, nounifiedhosts=False
+            extensions="", outputsubfolder="", numberofrules=5, skipstatichosts=False, nounifiedhosts=False, addsystemhostname=True
         )
         with self.mock_property("platform.system") as system:
             system.return_value = "Linux"

updateHostsFile.py

@@ -91,6 +91,7 @@ def get_defaults():
         "commonexclusions": ["hulu.com"],
         "blacklistfile": path_join_robust(BASEDIR_PATH, "blacklist"),
         "whitelistfile": path_join_robust(BASEDIR_PATH, "whitelist"),
+        "addsystemhostname": True,
     }
 
 
@@ -229,6 +230,14 @@ def main():
         default=path_join_robust(BASEDIR_PATH, "blacklist"),
         help="Blacklist file to use while generating hosts files.",
     )
+    parser.add_argument(
+        "--dont-add-system-hostname",
+        "-d",
+        dest="addsystemhostname",
+        default=True,
+        action="store_false",
+        help="Don't add the current system hostname while generating hosts files.",
+    )
 
     global settings
 
@@ -327,6 +336,7 @@ def main():
         outputsubfolder=outputsubfolder,
         skipstatichosts=skipstatichosts,
         nounifiedhosts=nounifiedhosts,
+        addsystemhostname=settings["addsystemhostname"],
     )
     finalfile.close()
 
@@ -1272,6 +1282,7 @@ def write_opening_header(finalfile, **headerparams):
         3) outputsubfolder
         4) skipstatichosts
         5) nounifiedhosts
+        6) hostfilename
     """
 
     finalfile.seek(0)  # Reset file pointer.
@@ -1389,7 +1400,7 @@ def write_opening_header(finalfile, **headerparams):
         write_data(finalfile, "ff02::3 ip6-allhosts\n")
         write_data(finalfile, "0.0.0.0 0.0.0.0\n")
 
-        if platform.system() == "Linux":
+        if platform.system() == "Linux" and "addsystemhostname" in headerparams.keys() and headerparams["addsystemhostname"]:
             write_data(finalfile, "127.0.1.1 " + socket.gethostname() + "\n")
             write_data(finalfile, "127.0.0.53 " + socket.gethostname() + "\n")