From c5e75278d7364cb4203222a72c3efa1fbe86c1d6 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 26 Mar 2009 14:40:20 -0500 Subject: [PATCH] More cleanup of windows code --- cobbler/action_litesync.py | 1 - cobbler/action_sync.py | 9 --------- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/cobbler/action_litesync.py b/cobbler/action_litesync.py index 672f01c..7217246 100644 --- a/cobbler/action_litesync.py +++ b/cobbler/action_litesync.py @@ -87,7 +87,6 @@ class BootLiteSync: def remove_single_distro(self, name): bootloc = utils.tftpboot_location() - print _("DEBUG: unmounting %s" % os.path.join(bootloc, name)) # delete contents of images/$name directory in webdir utils.rmtree(os.path.join(self.settings.webdir, "images", name)) # delete contents of images/$name in tftpboot diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 1f73914..6bd7f0f 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -110,7 +110,6 @@ class BootSync: if self.verbose: print "- copying images" self.pxegen.copy_images() - self.pxegen.generate_windows_files() for x in self.systems: if self.verbose: print "- copying files for system: %s" % x.name @@ -170,8 +169,6 @@ class BootSync: yaboot_bin_dir = os.path.join(self.bootloc, "ppc") yaboot_cfg_dir = os.path.join(self.bootloc, "etc") s390_dir = os.path.join(self.bootloc, "s390x") - profiles_dir = os.path.join(self.bootloc, "profiles") - systems_dir = os.path.join(self.bootloc, "systems") rendered_dir = os.path.join(self.settings.webdir, "rendered") if not os.path.exists(pxelinux_dir): utils.mkdir(pxelinux_dir,verbose=self.verbose) @@ -183,17 +180,11 @@ class BootSync: utils.mkdir(yaboot_bin_dir,verbose=self.verbose) if not os.path.exists(yaboot_cfg_dir): utils.mkdir(yaboot_cfg_dir,verbose=self.verbose) - if not os.path.exists(profiles_dir): - utils.mkdir(profiles_dir,verbose=self.verbose) - if not os.path.exists(systems_dir): - utils.mkdir(systems_dir,verbose=self.verbose) utils.rmtree_contents(os.path.join(self.bootloc, "pxelinux.cfg"),verbose=self.verbose) utils.rmtree_contents(os.path.join(self.bootloc, "images"),verbose=self.verbose) utils.rmtree_contents(os.path.join(self.bootloc, "s390x"),verbose=self.verbose) utils.rmtree_contents(os.path.join(self.bootloc, "ppc"),verbose=self.verbose) utils.rmtree_contents(os.path.join(self.bootloc, "etc"),verbose=self.verbose) - utils.rmtree_contents(profiles_dir,verbose=self.verbose) - utils.rmtree_contents(systems_dir,verbose=self.verbose) utils.rmtree_contents(rendered_dir,verbose=self.verbose) -- 1.5.5.1