Merge lp:~ubuntu-branches/ubuntu/oneiric/cobbler/oneiric-201106090005 into lp:ubuntu/oneiric/cobbler

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/cobbler now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/cobbler/oneiric-201106090005. A merge should be performed if necessary.

[Dave Walker (davewalker)]

This seems to be unintentional fallout.

review: Disapprove

Unmerged revisions

26. By Andres Rodriguez on 2011-06-08

* debian/patches/42_fix_repomirror_create_sync.patch: Improve method to
  obtain Ubuntu mirror to use if python-apt installed.
* debian/cobbler.postinst: Really fix setting of 'server'. Move the logic
  to obtain IP to debian/cobbler.config and set it default if available.

25. By Andres Rodriguez on 2011-06-08

Un-apply all patches and remove .pc. IMO branches should not reflect patches
applied as they generate huge diff's when updating or working with them.

=== removed file '.pc/.version'
--- .pc/.version	2011-01-18 12:03:14 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed directory '.pc/05_cobbler_fix_reposync_permissions.patch'
=== removed directory '.pc/05_cobbler_fix_reposync_permissions.patch/cobbler'
=== removed file '.pc/05_cobbler_fix_reposync_permissions.patch/cobbler/action_reposync.py'
--- .pc/05_cobbler_fix_reposync_permissions.patch/cobbler/action_reposync.py	2011-01-28 14:39:12 +0000
+++ .pc/05_cobbler_fix_reposync_permissions.patch/cobbler/action_reposync.py	1970-01-01 00:00:00 +0000
@@ -1,568 +0,0 @@
-"""
-Builds out and synchronizes yum repo mirrors.
-Initial support for rsync, perhaps reposync coming later.
-
-Copyright 2006-2007, Red Hat, Inc
-Michael DeHaan <[e-mail]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-"""
-
-import os
-import os.path
-import time
-import yaml # Howell-Clark version
-import sys
-HAS_YUM = True
-try:
-    import yum
-except:
-    HAS_YUM = False
-
-import utils
-from cexceptions import *
-import traceback
-import errno
-from utils import _
-import clogger
-
-class RepoSync:
-    """
-    Handles conversion of internal state to the tftpboot tree layout
-    """
-
-    # ==================================================================================
-
-    def __init__(self,config,tries=1,nofail=False,logger=None):
-        """
-        Constructor
-        """
-        self.verbose   = True
-        self.api       = config.api
-        self.config    = config
-        self.distros   = config.distros()
-        self.profiles  = config.profiles()
-        self.systems   = config.systems()
-        self.settings  = config.settings()
-        self.repos     = config.repos()
-        self.rflags    = self.settings.reposync_flags
-        self.tries     = tries
-        self.nofail    = nofail
-        self.logger    = logger
-
-        if logger is None:
-           self.logger = clogger.Logger()
-
-        self.logger.info("hello, reposync")
-
-
-    # ===================================================================
-
-    def run(self, name=None, verbose=True):
-        """
-        Syncs the current repo configuration file with the filesystem.
-        """
-            
-        self.logger.info("run, reposync, run!")
-        
-        try:
-            self.tries = int(self.tries)
-        except:
-            utils.die(self.logger,"retry value must be an integer")
-
-        self.verbose = verbose
-
-        report_failure = False
-        for repo in self.repos:
-
-            env = repo.environment
-
-            for k in env.keys():
-                self.logger.info("environment: %s=%s" % (k,env[k]))
-                if env[k] is not None:
-                    os.putenv(k,env[k])
-
-            if name is not None and repo.name != name:
-                # invoked to sync only a specific repo, this is not the one
-                continue
-            elif name is None and not repo.keep_updated:
-                # invoked to run against all repos, but this one is off
-                self.logger.info("%s is set to not be updated" % repo.name)
-                continue
-
-            repo_mirror = os.path.join(self.settings.webdir, "repo_mirror")
-            repo_path = os.path.join(repo_mirror, repo.name)
-            mirror = repo.mirror
-
-            if not os.path.isdir(repo_path) and not repo.mirror.lower().startswith("rhn://"):
-                os.makedirs(repo_path)
-            
-            # which may actually NOT reposync if the repo is set to not mirror locally
-            # but that's a technicality
-
-            for x in range(self.tries+1,1,-1):
-                success = False
-                try:
-                    self.sync(repo) 
-                    success = True
-                except:
-                    utils.log_exc(self.logger)
-                    self.logger.warning("reposync failed, tries left: %s" % (x-2))
-
-            if not success:
-                report_failure = True
-                if not self.nofail:
-                    utils.die(self.logger,"reposync failed, retry limit reached, aborting")
-                else:
-                    self.logger.error("reposync failed, retry limit reached, skipping")
-
-            self.update_permissions(repo_path)
-
-        if report_failure:
-            utils.die(self.logger,"overall reposync failed, at least one repo failed to synchronize")
-
-        return True
-
-    # ==================================================================================
-
-    def sync(self, repo):
-      
-        """
-        Conditionally sync a repo, based on type.
-        """
-
-        if repo.breed == "rhn":
-            return self.rhn_sync(repo)
-        elif repo.breed == "yum":
-            return self.yum_sync(repo)
-        elif repo.breed == "apt":
-            return self.apt_sync(repo)
-        elif repo.breed == "rsync":
-            return self.rsync_sync(repo)
-        else:
-            utils.die(self.logger,"unable to sync repo (%s), unknown or unsupported repo type (%s)" % (repo.name, repo.breed))
-
-    # ====================================================================================
-
-    def createrepo_walker(self, repo, dirname, fnames):
-        """
-        Used to run createrepo on a copied Yum mirror.
-        """
-        if os.path.exists(dirname) or repo['breed'] == 'rsync':
-            utils.remove_yum_olddata(dirname)
-
-            # add any repo metadata we can use
-            mdoptions = []
-            if os.path.isfile("%s/.origin/repomd.xml" % (dirname)):
-                if not HAS_YUM:
-                   utils.die(self.logger,"yum is required to use this feature")
-
-                rmd = yum.repoMDObject.RepoMD('', "%s/.origin/repomd.xml" % (dirname))
-                if rmd.repoData.has_key("group"):
-                    groupmdfile = rmd.getData("group").location[1]
-                    mdoptions.append("-g %s" % groupmdfile)
-                if rmd.repoData.has_key("prestodelta"):
-                    # need createrepo >= 0.9.7 to add deltas
-                    if utils.check_dist() == "redhat" or utils.check_dist() == "suse":
-                        cmd = "/usr/bin/rpmquery --queryformat=%{VERSION} createrepo"
-                        createrepo_ver = utils.subprocess_get(self.logger, cmd)
-                        if createrepo_ver >= "0.9.7":
-                            mdoptions.append("--deltas")
-                        else:
-                            self.logger.error("this repo has presto metadata; you must upgrade createrepo to >= 0.9.7 first and then need to resync the repo through cobbler.")
-
-            blended = utils.blender(self.api, False, repo)
-            flags = blended.get("createrepo_flags","(ERROR: FLAGS)")
-            try:
-                # BOOKMARK
-                cmd = "createrepo %s %s %s" % (" ".join(mdoptions), flags, dirname)
-                utils.subprocess_call(self.logger, cmd)
-            except:
-                utils.log_exc(self.logger)
-                self.logger.error("createrepo failed.")
-            del fnames[:] # we're in the right place
-
-    # ====================================================================================
-
-    def rsync_sync(self, repo):
-
-        """
-        Handle copying of rsync:// and rsync-over-ssh repos.
-        """
-
-        repo_mirror = repo.mirror
-
-        if not repo.mirror_locally:
-            utils.die(self.logger,"rsync:// urls must be mirrored locally, yum cannot access them directly")
-
-        if repo.rpm_list != "" and repo.rpm_list != []:
-            self.logger.warning("--rpm-list is not supported for rsync'd repositories")
-
-        # FIXME: don't hardcode
-        dest_path = os.path.join("/var/www/cobbler/repo_mirror", repo.name)
-
-        spacer = ""
-        if not repo.mirror.startswith("rsync://") and not repo.mirror.startswith("/"):
-            spacer = "-e ssh"
-        if not repo.mirror.endswith("/"):
-            repo.mirror = "%s/" % repo.mirror
-
-        # FIXME: wrapper for subprocess that logs to logger
-        cmd = "rsync -rltDv %s --delete --exclude-from=/etc/cobbler/rsync.exclude %s %s" % (spacer, repo.mirror, dest_path)
-        rc = utils.subprocess_call(self.logger, cmd)
-
-        if rc !=0:
-            utils.die(self.logger,"cobbler reposync failed")
-        os.path.walk(dest_path, self.createrepo_walker, repo)
-        self.create_local_file(dest_path, repo)
-
-    # ====================================================================================
-    
-    def rhn_sync(self, repo):
-
-        """
-        Handle mirroring of RHN repos.
-        """
-
-        repo_mirror = repo.mirror
-
-        # FIXME? warn about not having yum-utils.  We don't want to require it in the package because
-        # RHEL4 and RHEL5U0 don't have it.
-
-        if not os.path.exists("/usr/bin/reposync"):
-            utils.die(self.logger,"no /usr/bin/reposync found, please install yum-utils")
-
-        cmd = ""                  # command to run
-        has_rpm_list = False      # flag indicating not to pull the whole repo
-
-        # detect cases that require special handling
-
-        if repo.rpm_list != "" and repo.rpm_list != []:
-            has_rpm_list = True
-
-        # create yum config file for use by reposync
-        # FIXME: don't hardcode
-        dest_path = os.path.join("/var/www/cobbler/repo_mirror", repo.name)
-        temp_path = os.path.join(dest_path, ".origin")
-
-        if not os.path.isdir(temp_path):
-            # FIXME: there's a chance this might break the RHN D/L case
-            os.makedirs(temp_path)
-         
-        # how we invoke yum-utils depends on whether this is RHN content or not.
-
-       
-        # this is the somewhat more-complex RHN case.
-        # NOTE: this requires that you have entitlements for the server and you give the mirror as rhn://$channelname
-        if not repo.mirror_locally:
-            utils.die("rhn:// repos do not work with --mirror-locally=1")
-
-        if has_rpm_list:
-            self.logger.warning("warning: --rpm-list is not supported for RHN content")
-        rest = repo.mirror[6:] # everything after rhn://
-        cmd = "/usr/bin/reposync %s -r %s --download_path=%s" % (self.rflags, rest, "/var/www/cobbler/repo_mirror")
-        if repo.name != rest:
-            args = { "name" : repo.name, "rest" : rest }
-            utils.die(self.logger,"ERROR: repository %(name)s needs to be renamed %(rest)s as the name of the cobbler repository must match the name of the RHN channel" % args)
-
-        if repo.arch == "i386":
-            # counter-intuitive, but we want the newish kernels too
-            repo.arch = "i686"
-
-        if repo.arch != "":
-            cmd = "%s -a %s" % (cmd, repo.arch)
-
-        # now regardless of whether we're doing yumdownloader or reposync
-        # or whether the repo was http://, ftp://, or rhn://, execute all queued
-        # commands here.  Any failure at any point stops the operation.
-
-        if repo.mirror_locally:
-            rc = utils.subprocess_call(self.logger, cmd)
-            # Don't die if reposync fails, it is logged
-            # if rc !=0:
-            #     utils.die(self.logger,"cobbler reposync failed")
-
-        # some more special case handling for RHN.
-        # create the config file now, because the directory didn't exist earlier
-
-        temp_file = self.create_local_file(temp_path, repo, output=False)
-
-        # now run createrepo to rebuild the index
-
-        if repo.mirror_locally:
-            os.path.walk(dest_path, self.createrepo_walker, repo)
-
-        # create the config file the hosts will use to access the repository.
-
-        self.create_local_file(dest_path, repo)
-
-    # ====================================================================================
-
-    def yum_sync(self, repo):
-
-        """
-        Handle copying of http:// and ftp:// yum repos.
-        """
-
-        repo_mirror = repo.mirror
-
-        # warn about not having yum-utils.  We don't want to require it in the package because
-        # RHEL4 and RHEL5U0 don't have it.
-
-        if not os.path.exists("/usr/bin/reposync"):
-            utils.die(self.logger,"no /usr/bin/reposync found, please install yum-utils")
-
-        cmd = ""                  # command to run
-        has_rpm_list = False      # flag indicating not to pull the whole repo
-
-        # detect cases that require special handling
-
-        if repo.rpm_list != "" and repo.rpm_list != []:
-            has_rpm_list = True
-
-        # create yum config file for use by reposync
-        dest_path = os.path.join("/var/www/cobbler/repo_mirror", repo.name)
-        temp_path = os.path.join(dest_path, ".origin")
-
-        if not os.path.isdir(temp_path) and repo.mirror_locally:
-            # FIXME: there's a chance this might break the RHN D/L case
-            os.makedirs(temp_path)
-         
-        # create the config file that yum will use for the copying
-
-        if repo.mirror_locally:
-            temp_file = self.create_local_file(temp_path, repo, output=False)
-
-        if not has_rpm_list and repo.mirror_locally:
-            # if we have not requested only certain RPMs, use reposync
-            cmd = "/usr/bin/reposync %s --config=%s --repoid=%s --download_path=%s" % (self.rflags, temp_file, repo.name, "/var/www/cobbler/repo_mirror")
-            if repo.arch != "":
-                if repo.arch == "x86":
-                   repo.arch = "i386" # FIX potential arch errors
-                if repo.arch == "i386":
-                   # counter-intuitive, but we want the newish kernels too
-                   cmd = "%s -a i686" % (cmd)
-                else:
-                   cmd = "%s -a %s" % (cmd, repo.arch)
-
-        elif repo.mirror_locally:
-
-            # create the output directory if it doesn't exist
-            if not os.path.exists(dest_path):
-               os.makedirs(dest_path)
-
-            use_source = ""
-            if repo.arch == "src":
-                use_source = "--source"
- 
-            # older yumdownloader sometimes explodes on --resolvedeps
-            # if this happens to you, upgrade yum & yum-utils
-            extra_flags = self.settings.yumdownloader_flags
-            cmd = "/usr/bin/yumdownloader %s %s --disablerepo=* --enablerepo=%s -c %s --destdir=%s %s" % (extra_flags, use_source, repo.name, temp_file, dest_path, " ".join(repo.rpm_list))
-
-        # now regardless of whether we're doing yumdownloader or reposync
-        # or whether the repo was http://, ftp://, or rhn://, execute all queued
-        # commands here.  Any failure at any point stops the operation.
-
-        if repo.mirror_locally:
-            rc = utils.subprocess_call(self.logger, cmd)
-            if rc !=0:
-                utils.die(self.logger,"cobbler reposync failed")
-
-        repodata_path = os.path.join(dest_path, "repodata")
-
-        if not os.path.exists("/usr/bin/wget"):
-            utils.die(self.logger,"no /usr/bin/wget found, please install wget")
-
-        # grab repomd.xml and use it to download any metadata we can use
-        cmd2 = "/usr/bin/wget -q %s/repodata/repomd.xml -O %s/repomd.xml" % (repo_mirror, temp_path)
-        rc = utils.subprocess_call(self.logger,cmd2)
-        if rc == 0:
-            # create our repodata directory now, as any extra metadata we're
-            # about to download probably lives there
-            if not os.path.isdir(repodata_path):
-                os.makedirs(repodata_path)
-            rmd = yum.repoMDObject.RepoMD('', "%s/repomd.xml" % (temp_path))
-            for mdtype in rmd.repoData.keys():
-                # don't download metadata files that are created by default
-                if mdtype not in ["primary", "primary_db", "filelists", "filelists_db", "other", "other_db"]:
-                    mdfile = rmd.getData(mdtype).location[1]
-                    cmd3 = "/usr/bin/wget -q %s/%s -O %s/%s" % (repo_mirror, mdfile, dest_path, mdfile)
-                    utils.subprocess_call(self.logger,cmd3)
-                    if rc !=0:
-                        utils.die(self.logger,"wget failed")
-
-        # now run createrepo to rebuild the index
-
-        if repo.mirror_locally:
-            os.path.walk(dest_path, self.createrepo_walker, repo)
-
-        # create the config file the hosts will use to access the repository.
-
-        self.create_local_file(dest_path, repo)
-
-    # ====================================================================================
- 
-
-    def apt_sync(self, repo):
-
-        """
-        Handle copying of http:// and ftp:// debian repos.
-        """
-
-        repo_mirror = repo.mirror
-
-        # warn about not having mirror program.
-
-        mirror_program = "/usr/bin/debmirror"
-        if not os.path.exists(mirror_program):
-            utils.die(self.logger,"no %s found, please install it"%(mirror_program))
-
-        cmd = ""                  # command to run
-        has_rpm_list = False      # flag indicating not to pull the whole repo
-
-        # detect cases that require special handling
-
-        if repo.rpm_list != "" and repo.rpm_list != []:
-            utils.die(self.logger,"has_rpm_list not yet supported on apt repos")
-
-        if not repo.arch:
-            utils.die(self.logger,"Architecture is required for apt repositories")
-
-        # built destination path for the repo
-        dest_path = os.path.join("/var/www/cobbler/repo_mirror", repo.name)
-         
-        if repo.mirror_locally:
-            mirror = repo.mirror.replace("@@suite@@",repo.os_version)
-
-            idx = mirror.find("://")
-            method = mirror[:idx]
-            mirror = mirror[idx+3:]
-
-            idx = mirror.find("/")
-            host = mirror[:idx]
-            mirror = mirror[idx+1:]
-
-            idx = mirror.rfind("/dists/")
-            suite = mirror[idx+7:]
-            mirror = mirror[:idx]
-
-            mirror_data = "--method=%s --host=%s --root=%s --dist=%s " % ( method , host , mirror , suite )
-
-            # FIXME : flags should come from repo instead of being hardcoded
-
-            rflags = "--passive --nocleanup"
-            for x in repo.yumopts:
-                if repo.yumopts[x]:
-                    rflags += " %s %s" % ( x , repo.yumopts[x] ) 
-                else:
-                    rflags += " %s" % x 
-            cmd = "%s %s %s %s" % (mirror_program, rflags, mirror_data, dest_path)
-            if repo.arch == "src":
-                cmd = "%s --source" % cmd
-            else:
-                arch = repo.arch
-                if arch == "x86":
-                   arch = "i386" # FIX potential arch errors
-                if arch == "x86_64":
-                   arch = "amd64" # FIX potential arch errors
-                cmd = "%s --nosource -a %s" % (cmd, arch)
-                    
-            rc = utils.subprocess_call(self.logger, cmd)
-            if rc !=0:
-                utils.die(self.logger,"cobbler reposync failed")
-
-       
-    def create_local_file(self, dest_path, repo, output=True):
-        """
-
-        Creates Yum config files for use by reposync
-
-        Two uses:
-        (A) output=True, Create local files that can be used with yum on provisioned clients to make use of this mirror.
-        (B) output=False, Create a temporary file for yum to feed into yum for mirroring
-        """
-    
-        # the output case will generate repo configuration files which are usable
-        # for the installed systems.  They need to be made compatible with --server-override
-        # which means they are actually templates, which need to be rendered by a cobbler-sync
-        # on per profile/system basis.
-
-        if output:
-            fname = os.path.join(dest_path,"config.repo")
-        else:
-            fname = os.path.join(dest_path, "%s.repo" % repo.name)
-        self.logger.debug("creating: %s" % fname)
-        if not os.path.exists(dest_path):
-            utils.mkdir(dest_path)
-        config_file = open(fname, "w+")
-        config_file.write("[%s]\n" % repo.name)
-        config_file.write("name=%s\n" % repo.name)
-        optenabled = False
-        optgpgcheck = False
-        if output:
-            if repo.mirror_locally:
-                line = "baseurl=http://${server}/cobbler/repo_mirror/%s\n" % (repo.name)
-            else:
-                mstr = repo.mirror
-                if mstr.startswith("/"):
-                    mstr = "file://%s" % mstr
-                line = "baseurl=%s\n" % mstr
-  
-            config_file.write(line)
-            # user may have options specific to certain yum plugins
-            # add them to the file
-            for x in repo.yumopts:
-                config_file.write("%s=%s\n" % (x, repo.yumopts[x]))
-                if x == "enabled":
-                    optenabled = True
-                if x == "gpgcheck":
-                    optgpgcheck = True
-        else:
-            mstr = repo.mirror
-            if mstr.startswith("/"):
-                mstr = "file://%s" % mstr
-            line = "baseurl=%s\n" % mstr
-            if self.settings.http_port not in (80, '80'):
-                http_server = "%s:%s" % (self.settings.server, self.settings.http_port)
-            else:
-                http_server = self.settings.server
-            line = line.replace("@@server@@",http_server)
-            config_file.write(line)
-        if not optenabled:
-            config_file.write("enabled=1\n")
-        config_file.write("priority=%s\n" % repo.priority)
-        # FIXME: potentially might want a way to turn this on/off on a per-repo basis
-        if not optgpgcheck:
-            config_file.write("gpgcheck=0\n")
-        config_file.close()
-        return fname 
-
-    # ==================================================================================
-
-    def update_permissions(self, repo_path):
-        """
-        Verifies that permissions and contexts after an rsync are as expected.
-        Sending proper rsync flags should prevent the need for this, though this is largely
-        a safeguard.
-        """
-        # all_path = os.path.join(repo_path, "*")
-        cmd1 = "chown -R root:apache %s" % repo_path
-        utils.subprocess_call(self.logger, cmd1)
-
-        cmd2 = "chmod -R 755 %s" % repo_path
-        utils.subprocess_call(self.logger, cmd2)
-

=== removed directory '.pc/12_fix_dhcp_restart.patch'
=== removed directory '.pc/12_fix_dhcp_restart.patch/cobbler'
=== removed directory '.pc/12_fix_dhcp_restart.patch/cobbler/modules'
=== removed file '.pc/12_fix_dhcp_restart.patch/cobbler/modules/sync_post_restart_services.py'
--- .pc/12_fix_dhcp_restart.patch/cobbler/modules/sync_post_restart_services.py	2011-01-28 14:39:12 +0000
+++ .pc/12_fix_dhcp_restart.patch/cobbler/modules/sync_post_restart_services.py	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-import distutils.sysconfig
-import sys
-import os
-import traceback
-import cexceptions
-import os
-import sys
-import xmlrpclib
-import cobbler.module_loader as module_loader
-import cobbler.utils as utils
-
-plib = distutils.sysconfig.get_python_lib()
-mod_path="%s/cobbler" % plib
-sys.path.insert(0, mod_path)
-
-def register():
-    # this pure python trigger acts as if it were a legacy shell-trigger, but is much faster.
-    # the return of this method indicates the trigger type
-    return "/var/lib/cobbler/triggers/sync/post/*"
-
-def run(api,args,logger):
-
-    settings = api.settings()
-
-    manage_dhcp        = str(settings.manage_dhcp).lower()
-    manage_dns         = str(settings.manage_dns).lower()
-    manage_tftpd       = str(settings.manage_tftpd).lower()
-    restart_dhcp       = str(settings.restart_dhcp).lower()
-    restart_dns        = str(settings.restart_dns).lower()
-
-    which_dhcp_module = module_loader.get_module_from_file("dhcp","module",just_name=True).strip()
-    which_dns_module  = module_loader.get_module_from_file("dns","module",just_name=True).strip()
-
-    # special handling as we don't want to restart it twice
-    has_restarted_dnsmasq = False
-
-    rc = 0
-    if manage_dhcp != "0":
-        if which_dhcp_module == "manage_isc":
-            if restart_dhcp != "0":
-                rc = utils.subprocess_call(logger, "dhcpd -t -q", shell=True)
-                if rc != 0:
-                   logger.error("dhcpd -t failed")
-                   return 1
-                rc = utils.subprocess_call(logger,"service dhcpd restart", shell=True)
-        elif which_dhcp_module == "manage_dnsmasq":
-            if restart_dhcp != "0":
-                rc = utils.subprocess_call(logger, "service dnsmasq restart")
-                has_restarted_dnsmasq = True
-        else:
-            logger.error("unknown DHCP engine: %s" % which_dhcp_module)
-            rc = 411
-
-    if manage_dns != "0" and restart_dns != "0":
-        if which_dns_module == "manage_bind":
-            rc = utils.subprocess_call(logger, "service named restart", shell=True)
-        elif which_dns_module == "manage_dnsmasq" and not has_restarted_dnsmasq:
-            rc = utils.subprocess_call(logger, "service dnsmasq restart", shell=True)
-        elif which_dns_module == "manage_dnsmasq" and has_restarted_dnsmasq:
-            rc = 0
-        else:
-            logger.error("unknown DNS engine: %s" % which_dns_module)
-            rc = 412
-
-    return rc
-

=== removed directory '.pc/21_cobbler_use_netboot.patch'
=== removed directory '.pc/21_cobbler_use_netboot.patch/cobbler'
=== removed directory '.pc/21_cobbler_use_netboot.patch/cobbler/modules'
=== removed file '.pc/21_cobbler_use_netboot.patch/cobbler/modules/manage_import_debian_ubuntu.py'
--- .pc/21_cobbler_use_netboot.patch/cobbler/modules/manage_import_debian_ubuntu.py	2011-01-18 12:03:14 +0000
+++ .pc/21_cobbler_use_netboot.patch/cobbler/modules/manage_import_debian_ubuntu.py	1970-01-01 00:00:00 +0000
@@ -1,777 +0,0 @@
-"""
-This is some of the code behind 'cobbler sync'.
-
-Copyright 2006-2009, Red Hat, Inc
-Michael DeHaan <[e-mail]>
-John Eckersberg <[e-mail]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-"""
-
-import os
-import os.path
-import shutil
-import time
-import sys
-import glob
-import traceback
-import errno
-import re
-from utils import popen2
-from shlex import shlex
-
-
-import utils
-from cexceptions import *
-import templar
-
-import item_distro
-import item_profile
-import item_repo
-import item_system
-
-from utils import _
-
-def register():
-   """
-   The mandatory cobbler module registration hook.
-   """
-   return "manage/import"
-
-
-class ImportDebianUbuntuManager:
-
-    def __init__(self,config,logger):
-        """
-        Constructor
-        """
-        self.logger        = logger
-        self.config        = config
-        self.api           = config.api
-        self.distros       = config.distros()
-        self.profiles      = config.profiles()
-        self.systems       = config.systems()
-        self.settings      = config.settings()
-        self.repos         = config.repos()
-        self.templar       = templar.Templar(config)
-
-    # required function for import modules
-    def what(self):
-        return "import/debian_ubuntu"
-
-    # required function for import modules
-    def check_for_signature(self,path,cli_breed):
-       signatures = [
-           'pool',
-       ]
-
-       #self.logger.info("scanning %s for a debian/ubuntu distro signature" % path)
-       for signature in signatures:
-           d = os.path.join(path,signature)
-           if os.path.exists(d):
-               self.logger.info("Found a debian/ubuntu compatible signature: %s" % signature)
-               return (True,signature)
-
-       if cli_breed and cli_breed in self.get_valid_breeds():
-           self.logger.info("Warning: No distro signature for kernel at %s, using value from command line" % path)
-           return (True,None)
-
-       return (False,None)
-
-    # required function for import modules
-    def run(self,pkgdir,mirror,mirror_name,network_root=None,kickstart_file=None,rsync_flags=None,arch=None,breed=None,os_version=None):
-        self.pkgdir = pkgdir
-        self.mirror = mirror
-        self.mirror_name = mirror_name
-        self.network_root = network_root
-        self.kickstart_file = kickstart_file
-        self.rsync_flags = rsync_flags
-        self.arch = arch
-        self.breed = breed
-        self.os_version = os_version
-
-        # some fixups for the XMLRPC interface, which does not use "None"
-        if self.arch == "":           self.arch           = None
-        if self.mirror == "":         self.mirror         = None
-        if self.mirror_name == "":    self.mirror_name    = None
-        if self.kickstart_file == "": self.kickstart_file = None
-        if self.os_version == "":     self.os_version     = None
-        if self.rsync_flags == "":    self.rsync_flags    = None
-        if self.network_root == "":   self.network_root   = None
-
-        # If no breed was specified on the command line, figure it out
-        if self.breed == None:
-            self.breed = self.get_breed_from_directory()
-            if not self.breed:
-                utils.die(self.logger,"import failed - could not determine breed of debian-based distro")
-               
-        # debug log stuff for testing
-        #self.logger.info("DEBUG: self.pkgdir = %s" % str(self.pkgdir))
-        #self.logger.info("DEBUG: self.mirror = %s" % str(self.mirror))
-        #self.logger.info("DEBUG: self.mirror_name = %s" % str(self.mirror_name))
-        #self.logger.info("DEBUG: self.network_root = %s" % str(self.network_root))
-        #self.logger.info("DEBUG: self.kickstart_file = %s" % str(self.kickstart_file))
-        #self.logger.info("DEBUG: self.rsync_flags = %s" % str(self.rsync_flags))
-        #self.logger.info("DEBUG: self.arch = %s" % str(self.arch))
-        #self.logger.info("DEBUG: self.breed = %s" % str(self.breed))
-        #self.logger.info("DEBUG: self.os_version = %s" % str(self.os_version))
-
-        # both --import and --name are required arguments
-
-        if self.mirror is None:
-            utils.die(self.logger,"import failed.  no --path specified")
-        if self.mirror_name is None:
-            utils.die(self.logger,"import failed.  no --name specified")
-
-        # if --arch is supplied, validate it to ensure it's valid
-
-        if self.arch is not None and self.arch != "":
-            self.arch = self.arch.lower()
-            if self.arch == "x86":
-                # be consistent
-                self.arch = "i386"
-            if self.arch not in self.get_valid_arches():
-                utils.die(self.logger,"arch must be one of: %s" % string.join(self.get_valid_arches(),", "))
-
-        # if we're going to do any copying, set where to put things
-        # and then make sure nothing is already there.
-
-        self.path = os.path.normpath( "%s/ks_mirror/%s" % (self.settings.webdir, self.mirror_name) )
-        if os.path.exists(self.path) and self.arch is None:
-            # FIXME : Raise exception even when network_root is given ?
-            utils.die(self.logger,"Something already exists at this import location (%s).  You must specify --arch to avoid potentially overwriting existing files." % self.path)
-
-        # import takes a --kickstart for forcing selection that can't be used in all circumstances
-
-        if self.kickstart_file and not self.breed:
-            utils.die(self.logger,"Kickstart file can only be specified when a specific breed is selected")
-
-        if self.os_version and not self.breed:
-            utils.die(self.logger,"OS version can only be specified when a specific breed is selected")
-
-        if self.breed and self.breed.lower() not in self.get_valid_breeds():
-            utils.die(self.logger,"Supplied import breed is not supported by this module")
-
-        # if --arch is supplied, make sure the user is not importing a path with a different
-        # arch, which would just be silly.
-
-        if self.arch:
-            # append the arch path to the name if the arch is not already
-            # found in the name.
-            for x in self.get_valid_arches():
-                if self.path.lower().find(x) != -1:
-                    if self.arch != x :
-                        utils.die(self.logger,"Architecture found on pathname (%s) does not fit the one given in command line (%s)"%(x,self.arch))
-                    break
-            else:
-                # FIXME : This is very likely removed later at get_proposed_name, and the guessed arch appended again
-                self.path += ("-%s" % self.arch)
-
-        # make the output path and mirror content but only if not specifying that a network
-        # accessible support location already exists (this is --available-as on the command line)
-
-        if self.network_root is None:
-            # we need to mirror (copy) the files
-
-            utils.mkdir(self.path)
-
-            if self.mirror.startswith("http://") or self.mirror.startswith("ftp://") or self.mirror.startswith("nfs://"):
-
-                # http mirrors are kind of primative.  rsync is better.
-                # that's why this isn't documented in the manpage and we don't support them.
-                # TODO: how about adding recursive FTP as an option?
-
-                utils.die(self.logger,"unsupported protocol")
-
-            else:
-
-                # good, we're going to use rsync..
-                # we don't use SSH for public mirrors and local files.
-                # presence of user@host syntax means use SSH
-
-                # kick off the rsync now
-
-                if not utils.rsync_files(self.mirror, self.path, self.rsync_flags, self.logger):
-                    utils.die(self.logger, "failed to rsync the files")
-
-        else:
-
-            # rather than mirroring, we're going to assume the path is available
-            # over http, ftp, and nfs, perhaps on an external filer.  scanning still requires
-            # --mirror is a filesystem path, but --available-as marks the network path
-
-            if not os.path.exists(self.mirror):
-                utils.die(self.logger, "path does not exist: %s" % self.mirror)
-
-            # find the filesystem part of the path, after the server bits, as each distro
-            # URL needs to be calculated relative to this.
-
-            if not self.network_root.endswith("/"):
-                self.network_root = self.network_root + "/"
-            self.path = os.path.normpath( self.mirror )
-            valid_roots = [ "nfs://", "ftp://", "http://" ]
-            for valid_root in valid_roots:
-                if self.network_root.startswith(valid_root):
-                    break
-            else:
-                utils.die(self.logger, "Network root given to --available-as must be nfs://, ftp://, or http://")
-            if self.network_root.startswith("nfs://"):
-                try:
-                    (a,b,rest) = self.network_root.split(":",3)
-                except:
-                    utils.die(self.logger, "Network root given to --available-as is missing a colon, please see the manpage example.")
-
-        # now walk the filesystem looking for distributions that match certain patterns
-
-        self.logger.info("adding distros")
-        distros_added = []
-        # FIXME : search below self.path for isolinux configurations or known directories from TRY_LIST
-        os.path.walk(self.path, self.distro_adder, distros_added)
-
-        # find out if we can auto-create any repository records from the install tree
-
-        if self.network_root is None:
-            self.logger.info("associating repos")
-            # FIXME: this automagic is not possible (yet) without mirroring
-            self.repo_finder(distros_added)
-
-        # find the most appropriate answer files for each profile object
-
-        self.logger.info("associating kickstarts")
-        self.kickstart_finder(distros_added)
-
-        # ensure bootloaders are present
-        self.api.pxegen.copy_bootloaders()
-
-        return True
-
-    # required function for import modules
-    def get_valid_arches(self):
-        return ["i386", "ppc", "x86_64", "x86",]
-
-    # required function for import modules
-    def get_valid_breeds(self):
-        return ["debian","ubuntu"]
-
-    # required function for import modules
-    def get_valid_os_versions(self):
-        if self.breed == "debian":
-            return ["etch", "lenny", "squeeze", "sid", "stable", "testing", "unstable", "experimental",]
-        elif self.breed == "ubuntu":
-            return ["dapper", "hardy", "karmic", "lucid", "maverick", "natty",]
-        else:
-            return []
-
-    def get_valid_repo_breeds(self):
-        return ["apt",]
-
-    def get_release_files(self):
-        """
-        Find distro release packages.
-        """
-        return glob.glob(os.path.join(self.get_rootdir(), "dists/*"))
-
-    def get_breed_from_directory(self):
-        for breed in self.get_valid_breeds():
-            # NOTE : Although we break the loop after the first match,
-            # multiple debian derived distros can actually live at the same pool -- JP
-            d = os.path.join(self.mirror, breed)
-            if (os.path.islink(d) and os.path.isdir(d) and os.path.realpath(d) == os.path.realpath(self.mirror)) or os.path.basename(self.mirror) == breed:
-                return breed
-        else:
-            return None
-
-    def get_tree_location(self, distro):
-        """
-        Once a distribution is identified, find the part of the distribution
-        that has the URL in it that we want to use for kickstarting the
-        distribution, and create a ksmeta variable $tree that contains this.
-        """
-
-        base = self.get_rootdir()
-
-        if self.network_root is None:
-            dists_path = os.path.join(self.path, "dists")
-            if os.path.isdir(dists_path):
-                tree = "http://@@http_server@@/cblr/ks_mirror/%s" % (self.mirror_name)
-            else:
-                tree = "http://@@http_server@@/cblr/repo_mirror/%s" % (distro.name)
-            self.set_install_tree(distro, tree)
-        else:
-            # where we assign the kickstart source is relative to our current directory
-            # and the input start directory in the crawl.  We find the path segments
-            # between and tack them on the network source path to find the explicit
-            # network path to the distro that Anaconda can digest.
-            tail = self.path_tail(self.path, base)
-            tree = self.network_root[:-1] + tail
-            self.set_install_tree(distro, tree)
-
-        return
-
-    def repo_finder(self, distros_added):
-        for distro in distros_added:
-            self.logger.info("traversing distro %s" % distro.name)
-            # FIXME : Shouldn't decide this the value of self.network_root ?
-            if distro.kernel.find("ks_mirror") != -1:
-                basepath = os.path.dirname(distro.kernel)
-                top = self.get_rootdir()
-                self.logger.info("descent into %s" % top)
-                dists_path = os.path.join(self.path, "dists")
-                if not os.path.isdir(dists_path):
-                    self.process_repos()
-            else:
-                self.logger.info("this distro isn't mirrored")
-
-    def process_repos(self):
-        pass
-
-    def distro_adder(self,distros_added,dirname,fnames):
-        """
-        This is an os.path.walk routine that finds distributions in the directory
-        to be scanned and then creates them.
-        """
-
-        # FIXME: If there are more than one kernel or initrd image on the same directory,
-        # results are unpredictable
-
-        initrd = None
-        kernel = None
-
-        for x in fnames:
-            adtls = []
-
-            fullname = os.path.join(dirname,x)
-            if os.path.islink(fullname) and os.path.isdir(fullname):
-                if fullname.startswith(self.path):
-                    self.logger.warning("avoiding symlink loop")
-                    continue
-                self.logger.info("following symlink: %s" % fullname)
-                os.path.walk(fullname, self.distro_adder, distros_added)
-
-            if ( x.startswith("initrd") or x.startswith("ramdisk.image.gz") or x.startswith("vmkboot.gz") ) and x != "initrd.size":
-                initrd = os.path.join(dirname,x)
-            if ( x.startswith("vmlinu") or x.startswith("kernel.img") or x.startswith("linux") or x.startswith("mboot.c32") ) and x.find("initrd") == -1:
-                kernel = os.path.join(dirname,x)
-
-            # if we've collected a matching kernel and initrd pair, turn the in and add them to the list
-            if initrd is not None and kernel is not None:
-                adtls.append(self.add_entry(dirname,kernel,initrd))
-                kernel = None
-                initrd = None
-
-            for adtl in adtls:
-                distros_added.extend(adtl)
-
-    def add_entry(self,dirname,kernel,initrd):
-        """
-        When we find a directory with a valid kernel/initrd in it, create the distribution objects
-        as appropriate and save them.  This includes creating xen and rescue distros/profiles
-        if possible.
-        """
-
-        proposed_name = self.get_proposed_name(dirname,kernel)
-        proposed_arch = self.get_proposed_arch(dirname)
-
-        if self.arch and proposed_arch and self.arch != proposed_arch:
-            utils.die(self.logger,"Arch from pathname (%s) does not match with supplied one %s"%(proposed_arch,self.arch))
-
-        archs = self.learn_arch_from_tree()
-        if not archs:
-            if self.arch:
-                archs.append( self.arch )
-        else:
-            if self.arch and self.arch not in archs:
-                utils.die(self.logger, "Given arch (%s) not found on imported tree %s"%(self.arch,self.get_pkgdir()))
-        if proposed_arch:
-            if archs and proposed_arch not in archs:
-                self.logger.warning("arch from pathname (%s) not found on imported tree %s" % (proposed_arch,self.get_pkgdir()))
-                return
-
-            archs = [ proposed_arch ]
-
-        if len(archs)>1:
-            self.logger.warning("- Warning : Multiple archs found : %s" % (archs))
-
-        distros_added = []
-
-        for pxe_arch in archs:
-            name = proposed_name + "-" + pxe_arch
-            existing_distro = self.distros.find(name=name)
-
-            if existing_distro is not None:
-                self.logger.warning("skipping import, as distro name already exists: %s" % name)
-                continue
-
-            else:
-                self.logger.info("creating new distro: %s" % name)
-                distro = self.config.new_distro()
-
-            if name.find("-autoboot") != -1:
-                # this is an artifact of some EL-3 imports
-                continue
-
-            distro.set_name(name)
-            distro.set_kernel(kernel)
-            distro.set_initrd(initrd)
-            distro.set_arch(pxe_arch)
-            distro.set_breed(self.breed)
-            # If a version was supplied on command line, we set it now
-            if self.os_version:
-                distro.set_os_version(self.os_version)
-
-            self.distros.add(distro,save=True)
-            distros_added.append(distro)
-
-            existing_profile = self.profiles.find(name=name)
-
-            # see if the profile name is already used, if so, skip it and
-            # do not modify the existing profile
-
-            if existing_profile is None:
-                self.logger.info("creating new profile: %s" % name)
-                #FIXME: The created profile holds a default kickstart, and should be breed specific
-                profile = self.config.new_profile()
-            else:
-                self.logger.info("skipping existing profile, name already exists: %s" % name)
-                continue
-
-            # save our minimal profile which just points to the distribution and a good
-            # default answer file
-
-            profile.set_name(name)
-            profile.set_distro(name)
-            profile.set_kickstart(self.kickstart_file)
-
-            # depending on the name of the profile we can define a good virt-type
-            # for usage with koan
-
-            if name.find("-xen") != -1:
-                profile.set_virt_type("xenpv")
-            elif name.find("vmware") != -1:
-                profile.set_virt_type("vmware")
-            else:
-                profile.set_virt_type("qemu")
-
-            # save our new profile to the collection
-
-            self.profiles.add(profile,save=True)
-
-        return distros_added
-
-    def get_proposed_name(self,dirname,kernel=None):
-        """
-        Given a directory name where we have a kernel/initrd pair, try to autoname
-        the distribution (and profile) object based on the contents of that path
-        """
-
-        if self.network_root is not None:
-            name = self.mirror_name + "-".join(self.path_tail(os.path.dirname(self.path),dirname).split("/"))
-        else:
-            # remove the part that says /var/www/cobbler/ks_mirror/name
-            name = "-".join(dirname.split("/")[5:])
-
-        if kernel is not None and kernel.find("PAE") != -1:
-            name = name + "-PAE"
-
-        # These are all Ubuntu's doing, the netboot images are buried pretty
-        # deep. ;-) -JC
-        name = name.replace("-netboot","")
-        name = name.replace("-ubuntu-installer","")
-        name = name.replace("-amd64","")
-        name = name.replace("-i386","")
-
-        # we know that some kernel paths should not be in the name
-
-        name = name.replace("-images","")
-        name = name.replace("-pxeboot","")
-        name = name.replace("-install","")
-        name = name.replace("-isolinux","")
-
-        # some paths above the media root may have extra path segments we want
-        # to clean up
-
-        name = name.replace("-os","")
-        name = name.replace("-tree","")
-        name = name.replace("var-www-cobbler-", "")
-        name = name.replace("ks_mirror-","")
-        name = name.replace("--","-")
-
-        # remove any architecture name related string, as real arch will be appended later
-
-        name = name.replace("chrp","ppc64")
-
-        for separator in [ '-' , '_'  , '.' ] :
-            for arch in [ "i386" , "x86_64" , "ia64" , "ppc64", "ppc32", "ppc", "x86" , "s390x", "s390" , "386" , "amd" ]:
-                name = name.replace("%s%s" % ( separator , arch ),"")
-
-        return name
-
-    def get_proposed_arch(self,dirname):
-        """
-        Given an directory name, can we infer an architecture from a path segment?
-        """
-        if dirname.find("x86_64") != -1 or dirname.find("amd") != -1:
-            return "x86_64"
-        if dirname.find("ia64") != -1:
-            return "ia64"
-        if dirname.find("i386") != -1 or dirname.find("386") != -1 or dirname.find("x86") != -1:
-            return "i386"
-        if dirname.find("s390x") != -1:
-            return "s390x"
-        if dirname.find("s390") != -1:
-            return "s390"
-        if dirname.find("ppc64") != -1 or dirname.find("chrp") != -1:
-            return "ppc64"
-        if dirname.find("ppc32") != -1:
-            return "ppc"
-        if dirname.find("ppc") != -1:
-            return "ppc"
-        return None
-
-    def arch_walker(self,foo,dirname,fnames):
-        """
-        See docs on learn_arch_from_tree.
-
-        The TRY_LIST is used to speed up search, and should be dropped for default importer
-        Searched kernel names are kernel-header, linux-headers-, kernel-largesmp, kernel-hugemem
-
-        This method is useful to get the archs, but also to package type and a raw guess of the breed
-        """
-
-        # try to find a kernel header RPM and then look at it's arch.
-        for x in fnames:
-            if self.match_kernelarch_file(x):
-                for arch in self.get_valid_arches():
-                    if x.find(arch) != -1:
-                        foo[arch] = 1
-                for arch in [ "i686" , "amd64" ]:
-                    if x.find(arch) != -1:
-                        foo[arch] = 1
-
-    def kickstart_finder(self,distros_added):
-        """
-        For all of the profiles in the config w/o a kickstart, use the
-        given kickstart file, or look at the kernel path, from that,
-        see if we can guess the distro, and if we can, assign a kickstart
-        if one is available for it.
-        """
-        for profile in self.profiles:
-            distro = self.distros.find(name=profile.get_conceptual_parent().name)
-            if distro is None or not (distro in distros_added):
-                continue
-
-            kdir = os.path.dirname(distro.kernel)
-            if self.kickstart_file == None:
-                for file in self.get_release_files():
-                    results = self.scan_pkg_filename(file)
-                    # FIXME : If os is not found on tree but set with CLI, no kickstart is searched
-                    if results is None:
-                        self.logger.warning("skipping %s" % file)
-                        continue
-                    (flavor, major, minor, release) = results
-                    # Why use set_variance()? scan_pkg_filename() does everything we need now - jcammarata
-                    #version , ks = self.set_variance(flavor, major, minor, distro.arch)
-                    if self.os_version:
-                        if self.os_version != flavor:
-                            utils.die(self.logger,"CLI version differs from tree : %s vs. %s" % (self.os_version,flavor))
-                    distro.set_comment("%s %s (%s.%s.%s) %s" % (self.breed,flavor,major,minor,release,self.arch))
-                    distro.set_os_version(flavor)
-                    # is this even valid for debian/ubuntu? - jcammarata
-                    #ds = self.get_datestamp()
-                    #if ds is not None:
-                    #    distro.set_tree_build_time(ds)
-                    profile.set_kickstart("/var/lib/cobbler/kickstarts/sample.seed")
-                    self.profiles.add(profile,save=True)
-
-            self.configure_tree_location(distro)
-            self.distros.add(distro,save=True) # re-save
-            self.api.serialize()
-
-    def configure_tree_location(self, distro):
-        """
-        Once a distribution is identified, find the part of the distribution
-        that has the URL in it that we want to use for kickstarting the
-        distribution, and create a ksmeta variable $tree that contains this.
-        """
-
-        base = self.get_rootdir()
-
-        if self.network_root is None:
-            dists_path = os.path.join( self.path , "dists" )
-            if os.path.isdir( dists_path ):
-                tree = "http://@@http_server@@/cblr/ks_mirror/%s" % (self.mirror_name)
-            else:
-                tree = "http://@@http_server@@/cblr/repo_mirror/%s" % (distro.name)
-            self.set_install_tree(distro, tree)
-        else:
-            # where we assign the kickstart source is relative to our current directory
-            # and the input start directory in the crawl.  We find the path segments
-            # between and tack them on the network source path to find the explicit
-            # network path to the distro that Anaconda can digest.
-            tail = utils.path_tail(self.path, base)
-            tree = self.network_root[:-1] + tail
-            self.set_install_tree(distro, tree)
-
-    def get_rootdir(self):
-        return self.mirror
-
-    def get_pkgdir(self):
-        if not self.pkgdir:
-            return None
-        return os.path.join(self.get_rootdir(),self.pkgdir)
-
-    def set_install_tree(self, distro, url):
-        distro.ks_meta["tree"] = url
-
-    def learn_arch_from_tree(self):
-        """
-        If a distribution is imported from DVD, there is a good chance the path doesn't
-        contain the arch and we should add it back in so that it's part of the
-        meaningful name ... so this code helps figure out the arch name.  This is important
-        for producing predictable distro names (and profile names) from differing import sources
-        """
-        result = {}
-        # FIXME : this is called only once, should not be a walk
-        if self.get_pkgdir():
-            os.path.walk(self.get_pkgdir(), self.arch_walker, result)
-        if result.pop("amd64",False):
-            result["x86_64"] = 1
-        if result.pop("i686",False):
-            result["i386"] = 1
-        return result.keys()
-
-    def match_kernelarch_file(self, filename):
-        """
-        Is the given filename a kernel filename?
-        """
-        if not filename.endswith("deb"):
-            return False
-        if filename.startswith("linux-headers-"):
-            return True
-        return False
-
-    def scan_pkg_filename(self, file):
-        """
-        Determine what the distro is based on the release package filename.
-        """
-        # FIXME: all of these dist_names should probably be put in a function
-        # which would be called in place of looking in codes.py.  Right now
-        # you have to update both codes.py and this to add a new release
-        if self.breed == "debian":
-            dist_names = ['etch','lenny',]
-        elif self.breed == "ubuntu":
-            dist_names = ['dapper','hardy','intrepid','jaunty','karmic','lynx','maverick','natty',]
-        else:
-            return None
-
-        if os.path.basename(file) in dist_names:
-            release_file = os.path.join(file,'Release')
-            self.logger.info("Found %s release file: %s" % (self.breed,release_file))
-
-            f = open(release_file,'r')
-            lines = f.readlines()
-            f.close()
-
-            for line in lines:
-                if line.lower().startswith('version: '):
-                    version = line.split(':')[1].strip()
-                    values = version.split('.')
-                    if len(values) == 1:
-                        # I don't think you'd ever hit this currently with debian or ubuntu,
-                        # just including it for safety reasons
-                        return (os.path.basename(file), values[0], "0", "0")
-                    elif len(values) == 2:
-                        return (os.path.basename(file), values[0], values[1], "0")
-                    elif len(values) > 2:
-                        return (os.path.basename(file), values[0], values[1], values[2])
-        return None
-
-    def get_datestamp(self):
-        """
-        Not used for debian/ubuntu... should probably be removed? - jcammarata
-        """
-        pass
-
-    def set_variance(self, flavor, major, minor, arch):
-        """
-        Set distro specific versioning.
-        """
-        # I don't think this is required anymore, as the scan_pkg_filename() function
-        # above does everything we need it to - jcammarata
-        #
-        #if self.breed == "debian":
-        #    dist_names = { '4.0' : "etch" , '5.0' : "lenny" }
-        #    dist_vers = "%s.%s" % ( major , minor )
-        #    os_version = dist_names[dist_vers]
-        #
-        #    return os_version , "/var/lib/cobbler/kickstarts/sample.seed"
-        #elif self.breed == "ubuntu":
-        #    # Release names taken from wikipedia
-        #    dist_names = { '6.4'  :"dapper", 
-        #                   '8.4'  :"hardy", 
-        #                   '8.10' :"intrepid", 
-        #                   '9.4'  :"jaunty",
-        #                   '9.10' :"karmic",
-        #                   '10.4' :"lynx",
-        #                   '10.10':"maverick",
-        #                   '11.4' :"natty",
-        #                 }
-        #    dist_vers = "%s.%s" % ( major , minor )
-        #    if not dist_names.has_key( dist_vers ):
-        #        dist_names['4ubuntu2.0'] = "IntrepidIbex"
-        #    os_version = dist_names[dist_vers]
-        # 
-        #    return os_version , "/var/lib/cobbler/kickstarts/sample.seed"
-        #else:
-        #    return None
-        pass
-
-    def process_repos(self, main_importer, distro):
-        # Create a disabled repository for the new distro, and the security updates
-        #
-        # NOTE : We cannot use ks_meta nor os_version because they get fixed at a later stage
-
-        repo = item_repo.Repo(main_importer.config)
-        repo.set_breed( "apt" )
-        repo.set_arch( distro.arch )
-        repo.set_keep_updated( False )
-        repo.yumopts["--ignore-release-gpg"] = None
-        repo.yumopts["--verbose"] = None
-        repo.set_name( distro.name )
-        repo.set_os_version( distro.os_version )
-        # NOTE : The location of the mirror should come from timezone
-        repo.set_mirror( "http://ftp.%s.debian.org/debian/dists/%s" % ( 'us' , '@@suite@@' ) )
-
-        security_repo = item_repo.Repo(main_importer.config)
-        security_repo.set_breed( "apt" )
-        security_repo.set_arch( distro.arch )
-        security_repo.set_keep_updated( False )
-        security_repo.yumopts["--ignore-release-gpg"] = None
-        security_repo.yumopts["--verbose"] = None
-        security_repo.set_name( distro.name + "-security" )
-        security_repo.set_os_version( distro.os_version )
-        # There are no official mirrors for security updates
-        security_repo.set_mirror( "http://security.debian.org/debian-security/dists/%s/updates" % '@@suite@@' )
-
-        self.logger.info("Added repos for %s" % distro.name)
-        repos  = main_importer.config.repos()
-        repos.add(repo,save=True)
-        repos.add(security_repo,save=True)
-
-# ==========================================================================
-
-def get_import_manager(config,logger):
-    return ImportDebianUbuntuManager(config,logger)

=== removed directory '.pc/33_authn_configfile.patch'
=== removed directory '.pc/33_authn_configfile.patch/config'
=== removed file '.pc/33_authn_configfile.patch/config/modules.conf'
--- .pc/33_authn_configfile.patch/config/modules.conf	2011-04-04 12:55:44 +0000
+++ .pc/33_authn_configfile.patch/config/modules.conf	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-# cobbler module configuration file
-# =================================
-
-# authentication: 
-# what users can log into the WebUI and Read-Write XMLRPC?
-# choices:
-#    authn_denyall    -- no one (default)
-#    authn_configfile -- use /etc/cobbler/users.digest (for basic setups)
-#    authn_passthru   -- ask Apache to handle it (used for kerberos)
-#    authn_ldap       -- authenticate against LDAP
-#    authn_spacewalk  -- ask Spacewalk/Satellite (experimental)
-#    authn_testing    -- username/password is always testing/testing (debug)
-#    (user supplied)  -- you may write your own module
-# WARNING: this is a security setting, do not choose an option blindly.
-# for more information:
-# https://fedorahosted.org/cobbler/wiki/CobblerWebInterface
-# https://fedorahosted.org/cobbler/wiki/CustomizableSecurity
-# https://fedorahosted.org/cobbler/wiki/CobblerWithKerberos
-# https://fedorahosted.org/cobbler/wiki/CobblerWithLdap
-
-[authentication]
-module = authn_denyall
-
-# authorization: 
-# once a user has been cleared by the WebUI/XMLRPC, what can they do?
-# choices:
-#    authz_allowall   -- full access for all authneticated users (default)
-#    authz_ownership  -- use users.conf, but add object ownership semantics
-#    (user supplied)  -- you may write your own module
-# WARNING: this is a security setting, do not choose an option blindly.
-# If you want to further restrict cobbler with ACLs for various groups,
-# pick authz_ownership.  authz_allowall does not support ACLs.  configfile
-# does but does not support object ownership which is useful as an additional
-# layer of control.
-
-# for more information:
-# https://fedorahosted.org/cobbler/wiki/CobblerWebInterface
-# https://fedorahosted.org/cobbler/wiki/CustomizableSecurity
-# https://fedorahosted.org/cobbler/wiki/CustomizableAuthorization
-# https://fedorahosted.org/cobbler/wiki/AuthorizationWithOwnership
-# https://fedorahosted.org/cobbler/wiki/AclFeature
-
-[authorization]
-module = authz_allowall
-
-# dns:
-# chooses the DNS management engine if manage_dns is enabled
-# in /etc/cobbler/settings, which is off by default.
-# choices:
-#    manage_bind    -- default, uses BIND/named
-#    manage_dnsmasq -- uses dnsmasq, also must select dnsmasq for dhcp below
-# NOTE: more configuration is still required in /etc/cobbler
-# for more information:
-# https://fedorahosted.org/cobbler/wiki/ManageDns
-
-[dns]
-module = manage_bind
-
-# dhcp:
-# chooses the DHCP management engine if manage_dhcp is enabled
-# in /etc/cobbler/settings, which is off by default.
-# choices:
-#    manage_isc     -- default, uses ISC dhcpd
-#    manage_dnsmasq -- uses dnsmasq, also must select dnsmasq for dns above
-# NOTE: more configuration is still required in /etc/cobbler
-# for more information:
-# https://fedorahosted.org/cobbler/wiki/ManageDhcp
-  
-[dhcp]
-module = manage_isc
-
-# tftpd:
-# chooses the TFTP management engine if manage_tftp is enabled
-# in /etc/cobbler/settings, which is ON by default.
-#
-# choices:
-#    manage_in_tftpd -- default, uses the system's tftp server
-#    manage_tftpd_py -- uses cobbler's tftp server
-#
-# for more information:
-# https://fedorahosted.org/cobbler/wiki/ManageTftp
-  
-[tftpd]
-module = manage_in_tftpd
-
-#--------------------------------------------------

=== removed directory '.pc/34_fix_apache_wont_start.patch'
=== removed directory '.pc/34_fix_apache_wont_start.patch/config'
=== removed file '.pc/34_fix_apache_wont_start.patch/config/cobbler_web.conf'
--- .pc/34_fix_apache_wont_start.patch/config/cobbler_web.conf	2011-04-04 12:55:44 +0000
+++ .pc/34_fix_apache_wont_start.patch/config/cobbler_web.conf	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# This configuration file enables the cobbler web
-# interface (django version)
-
-<VirtualHost *:80>
-
-# Do not log the requests generated from the event notification system
-SetEnvIf Request_URI ".*/op/events/user/.*" dontlog
-# Log only what remains
-CustomLog logs/access_log combined env=!dontlog
-
-WSGIScriptAlias /cobbler_web /usr/share/cobbler/web/cobbler.wsgi
-
-</VirtualHost>
-

=== removed directory '.pc/39_cw_remove_vhost.patch'
=== removed directory '.pc/39_cw_remove_vhost.patch/config'
=== removed file '.pc/39_cw_remove_vhost.patch/config/cobbler_web.conf'
--- .pc/39_cw_remove_vhost.patch/config/cobbler_web.conf	2011-04-15 12:47:39 +0000
+++ .pc/39_cw_remove_vhost.patch/config/cobbler_web.conf	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# This configuration file enables the cobbler web
-# interface (django version)
-
-<VirtualHost *:80>
-
-# Do not log the requests generated from the event notification system
-SetEnvIf Request_URI ".*/op/events/user/.*" dontlog
-# Log only what remains
-#CustomLog logs/access_log combined env=!dontlog
-
-WSGIScriptAlias /cobbler_web /usr/share/cobbler/web/cobbler.wsgi
-
-</VirtualHost>
-

=== removed directory '.pc/40_ubuntu_bind9_management.patch'
=== removed directory '.pc/40_ubuntu_bind9_management.patch/cobbler'
=== removed file '.pc/40_ubuntu_bind9_management.patch/cobbler/action_check.py'
--- .pc/40_ubuntu_bind9_management.patch/cobbler/action_check.py	2011-04-18 11:15:59 +0000
+++ .pc/40_ubuntu_bind9_management.patch/cobbler/action_check.py	1970-01-01 00:00:00 +0000
@@ -1,482 +0,0 @@
-"""
-Validates whether the system is reasonably well configured for
-serving up content.  This is the code behind 'cobbler check'.
-
-Copyright 2006-2009, Red Hat, Inc
-Michael DeHaan <[e-mail]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-"""
-
-import os
-import re
-import action_sync
-import utils
-import glob
-from utils import _
-import clogger
-
-class BootCheck:
-
-   def __init__(self,config,logger=None):
-       """
-       Constructor
-       """
-       self.config   = config
-       self.settings = config.settings()
-       if logger is None:
-           logger       = clogger.Logger()
-       self.logger      = logger
-
-
-   def run(self):
-       """
-       Returns None if there are no errors, otherwise returns a list
-       of things to correct prior to running application 'for real'.
-       (The CLI usage is "cobbler check" before "cobbler sync")
-       """
-       status = []
-       self.checked_dist = utils.check_dist()
-       self.check_name(status)
-       self.check_selinux(status)
-       if self.settings.manage_dhcp:
-           mode = self.config.api.get_sync().dhcp.what()
-           if mode == "isc": 
-               self.check_dhcpd_bin(status)
-               self.check_dhcpd_conf(status)
-               self.check_service(status,"dhcpd")
-           elif mode == "dnsmasq":
-               self.check_dnsmasq_bin(status)
-               self.check_service(status,"dnsmasq")
-
-       if self.settings.manage_dns:
-           mode = self.config.api.get_sync().dns.what()
-           if mode == "bind":
-               self.check_bind_bin(status)
-               self.check_service(status,"named")
-           elif mode == "dnsmasq" and not self.settings.manage_dhcp:
-               self.check_dnsmasq_bin(status)
-               self.check_service(status,"dnsmasq")
-
-       mode = self.config.api.get_sync().tftpd.what()
-       if mode == "in_tftpd": 
-           self.check_tftpd_bin(status)
-           self.check_tftpd_dir(status)
-           self.check_tftpd_conf(status)
-       elif mode == "tftpd_py":
-           self.check_ctftpd_bin(status)
-           self.check_ctftpd_dir(status)
-           self.check_ctftpd_conf(status)
-
-       self.check_service(status, "cobblerd")
-    
-       self.check_bootloaders(status)
-       self.check_rsync_conf(status)
-       self.check_httpd(status)
-       self.check_iptables(status)
-       self.check_yum(status)
-       self.check_debmirror(status)
-       self.check_for_ksvalidator(status)
-       self.check_for_default_password(status)
-       self.check_for_unreferenced_repos(status)
-       self.check_for_unsynced_repos(status)
-       self.check_for_cman(status)
-
-       return status
-
-   def check_for_ksvalidator(self, status):
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       if not os.path.exists("/usr/bin/ksvalidator"):
-           status.append("ksvalidator was not found, install pykickstart")
-
-       return True
-
-   def check_for_cman(self, status):
-       # not doing rpm -q here to be cross-distro friendly
-       if not os.path.exists("/sbin/fence_ilo") and not os.path.exists("/usr/sbin/fence_ilo"):
-           status.append("fencing tools were not found, and are required to use the (optional) power management features. install cman or fence-agents to use them")
-       return True
-
-   def check_service(self, status, which, notes=""):
-       if notes != "":
-           notes = " (NOTE: %s)" % notes
-       rc = 0
-       if self.checked_dist == "redhat" or self.checked_dist == "suse":
-           if os.path.exists("/etc/rc.d/init.d/%s" % which):
-               rc = utils.subprocess_call(self.logger,"/sbin/service %s status > /dev/null 2>/dev/null" % which, shell=True)
-           if rc != 0:
-               status.append(_("service %s is not running%s") % (which,notes))
-               return False
-       elif self.checked_dist in ["debian", "ubuntu"]:
-           # we still use /etc/init.d
-           if os.path.exists("/etc/init.d/%s" % which):
-               rc = utils.subprocess_call(self.logger,"/etc/init.d/%s status /dev/null 2>/dev/null" % which, shell=True)
-           if rc != 0:
-               status.append(_("service %s is not running%s") % which,notes)
-               return False
-       elif self.checked_dist == "ubuntu":
-           if os.path.exists("/etc/init/%s.conf" % which):
-               rc = utils.subprocess_call(self.logger,"status %s > /dev/null 2>&1" % which, shell=True)
-           if rc != 0:
-               status.append(_("service %s is not running%s") % (which,notes))
-       else:
-           status.append(_("Unknown distribution type, cannot check for running service %s" % which))
-           return False
-       return True
-
-   def check_iptables(self, status):
-       if os.path.exists("/etc/rc.d/init.d/iptables"):
-           rc = utils.subprocess_call(self.logger,"/sbin/service iptables status >/dev/null 2>/dev/null", shell=True)
-           if rc == 0:
-              status.append(_("since iptables may be running, ensure 69, 80, and %(xmlrpc)s are unblocked") % { "xmlrpc" : self.settings.xmlrpc_port })
-
-   def check_yum(self,status):
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       if not os.path.exists("/usr/bin/createrepo"):
-           status.append(_("createrepo package is not installed, needed for cobbler import and cobbler reposync, install createrepo?"))
-       if not os.path.exists("/usr/bin/reposync"):
-           status.append(_("reposync is not installed, need for cobbler reposync, install/upgrade yum-utils?"))
-       if not os.path.exists("/usr/bin/yumdownloader"):
-           status.append(_("yumdownloader is not installed, needed for cobbler repo add with --rpm-list parameter, install/upgrade yum-utils?"))
-       if self.settings.reposync_flags.find("-l"):
-           if self.checked_dist == "redhat" or self.checked_dist == "suse":
-               yum_utils_ver = utils.subprocess_get(self.logger,"/usr/bin/rpmquery --queryformat=%{VERSION} yum-utils", shell=True)
-               if yum_utils_ver < "1.1.17":
-                   status.append(_("yum-utils need to be at least version 1.1.17 for reposync -l, current version is %s") % yum_utils_ver )
-
-   def check_debmirror(self,status):
-       if not os.path.exists("/usr/bin/debmirror"):
-           status.append(_("debmirror package is not installed, it will be required to manage debian deployments and repositories"))
-       if os.path.exists("/etc/debmirror.conf"):
-          f = open("/etc/debmirror.conf")
-          re_dists = re.compile(r'@dists=')
-          re_arches = re.compile(r'@arches=')
-          for line in f.readlines():
-             if re_dists.search(line) and not line.strip().startswith("#"):
-                 status.append(_("comment 'dists' on /etc/debmirror.conf for proper debian support"))
-             if re_arches.search(line) and not line.strip().startswith("#"):
-                 status.append(_("comment 'arches' on /etc/debmirror.conf for proper debian support"))
-       
-
-   def check_name(self,status):
-       """
-       If the server name in the config file is still set to localhost
-       kickstarts run from koan will not have proper kernel line
-       parameters.
-       """
-       if self.settings.server == "127.0.0.1":
-          status.append(_("The 'server' field in /etc/cobbler/settings must be set to something other than localhost, or kickstarting features will not work.  This should be a resolvable hostname or IP for the boot server as reachable by all machines that will use it."))
-       if self.settings.next_server == "127.0.0.1":
-          status.append(_("For PXE to be functional, the 'next_server' field in /etc/cobbler/settings must be set to something other than 127.0.0.1, and should match the IP of the boot server on the PXE network."))
-
-   def check_selinux(self,status):
-       """
-       Suggests various SELinux rules changes to run Cobbler happily with
-       SELinux in enforcing mode.  FIXME: this method could use some
-       refactoring in the future.
-       """
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       enabled = self.config.api.is_selinux_enabled()
-       if enabled:
-           data2 = utils.subprocess_get(self.logger,"/usr/sbin/getsebool -a",shell=True)
-           for line in data2.split("\n"):
-              if line.find("httpd_can_network_connect ") != -1:
-                  if line.find("off") != -1:
-                      status.append(_("Must enable a selinux boolean to enable vital web services components, run: setsebool -P httpd_can_network_connect true"))
-              if line.find("rsync_disable_trans ") != -1:
-                  if line.find("on") != -1:
-                      status.append(_("Must enable the cobbler import and replicate commands, run: setsebool -P rsync_disable_trans=1"))
-
-           data3 = utils.subprocess_get(self.logger,"/usr/sbin/semanage fcontext -l | grep public_content_t",shell=True)
-
-           rule1 = False
-           rule2 = False
-           rule3 = False
-           selinux_msg = "/usr/sbin/semanage fcontext -a -t public_content_t \"%s\""
-           for line in data3.split("\n"):
-               if line.startswith("/tftpboot/.*"):
-                   rule1 = True
-               if line.startswith("/var/lib/tftpboot/.*"):
-                   rule2 = True
-               if line.startswith("/var/www/cobbler/images/.*"):
-                   rule3 = True
-
-           rules = []
-           if os.path.exists("/tftpboot") and not rule1:
-               rules.append(selinux_msg % "/tftpboot/.*")
-           else:
-               if not rule2:
-                   rules.append(selinux_msg % "/var/lib/tftpboot/.*")
-           if not rule3:
-               rules.append(selinux_msg % "/var/www/cobbler/images/.*")
-           if len(rules) > 0:
-               status.append("you need to set some SELinux content rules to ensure cobbler serves content correctly in your SELinux environment, run the following: %s" % " && ".join(rules))
-
-           # now check to see that the Django sessions path is accessible
-           # by Apache
-           
-           data4 = utils.subprocess_get(self.logger,"/usr/sbin/semanage fcontext -l | grep httpd_sys_content_rw_t",shell=True)
-           selinux_msg = "you need to set some SELinux rules if you want to use cobbler-web (an optional package), run the following: /usr/sbin/semanage fcontext -a -t httpd_sys_content_rw_t \"%s\""
-           rule4 = False
-           for line in data4.split("\n"):
-               if line.startswith("/var/lib/cobbler/webui_sessions/.*"):
-                   rule4 = True
-           if not rule4:
-               status.append(selinux_msg % "/var/lib/cobbler/webui_sessions/.*")
-
-
-   def check_for_default_password(self,status):
-       default_pass = self.settings.default_password_crypted
-       if default_pass == "$1$mF86/UHC$WvcIcX2t6crBz2onWxyac.":
-           status.append(_("The default password used by the sample templates for newly installed machines (default_password_crypted in /etc/cobbler/settings) is still set to 'cobbler' and should be changed, try: \"openssl passwd -1 -salt 'random-phrase-here' 'your-password-here'\" to generate new one"))
-
-
-   def check_for_unreferenced_repos(self,status):
-        repos = []
-        referenced = []
-        not_found = []
-        for r in self.config.api.repos():
-            repos.append(r.name)
-        for p in self.config.api.profiles():
-            my_repos = p.repos
-            if my_repos != "<<inherit>>":
-                referenced.extend(my_repos)
-        for r in referenced:
-            if r not in repos and r != "<<inherit>>":
-                not_found.append(r)
-        if len(not_found) > 0:
-            status.append(_("One or more repos referenced by profile objects is no longer defined in cobbler: %s") % ", ".join(not_found))
-       
-   def check_for_unsynced_repos(self,status):
-       need_sync = []
-       for r in self.config.repos():
-           if r.mirror_locally == 1:
-               lookfor = os.path.join(self.settings.webdir, "repo_mirror", r.name)
-               if not os.path.exists(lookfor):
-                   need_sync.append(r.name)
-       if len(need_sync) > 0:
-           status.append(_("One or more repos need to be processed by cobbler reposync for the first time before kickstarting against them: %s") % ", ".join(need_sync))
-
-
-   def check_httpd(self,status):
-       """
-       Check if Apache is installed.
-       """
-       if self.checked_dist in [ "suse", "redhat" ]:
-           rc = utils.subprocess_get(self.logger,"httpd -v")
-       else:
-           rc = utils.subprocess_get(self.logger,"apache2 -v")
-       if rc.find("Server") == -1:
-           status.append("Apache (httpd) is not installed and/or in path")
-
-
-   def check_dhcpd_bin(self,status):
-       """
-       Check if dhcpd is installed
-       """
-       if not os.path.exists("/usr/sbin/dhcpd"):
-           status.append("dhcpd is not installed")
-
-   def check_dnsmasq_bin(self,status):
-       """
-       Check if dnsmasq is installed
-       """
-       rc = utils.subprocess_get(self.logger,"dnsmasq --help")
-       if rc.find("Valid options") == -1:
-           status.append("dnsmasq is not installed and/or in path")
-
-   def check_bind_bin(self,status):
-       """
-       Check if bind is installed.
-       """
-       rc = utils.subprocess_get(self.logger,"named -v")
-       # it should return something like "BIND 9.6.1-P1-RedHat-9.6.1-6.P1.fc11"
-       if rc.find("BIND") == -1:
-           status.append("named is not installed and/or in path")
-       
-   def check_bootloaders(self,status):
-       """
-       Check if network bootloaders are installed
-       """
-       # FIXME: move zpxe.rexx to loaders
-
-       bootloaders = {
-          "elilo"      : [ "/var/lib/cobbler/loaders/elilo*.efi" ],
-          "menu.c32"   : [ "/usr/share/syslinux/menu.c32",
-              "/usr/lib/syslinux/menu.c32",
-              "/var/lib/cobbler/loaders/menu.c32" ],
-          "yaboot"     : [ "/var/lib/cobbler/loaders/yaboot*" ],
-          "pxelinux.0" : [ "/usr/share/syslinux/pxelinux.0",
-              "/usr/lib/syslinux/pxelinux.0",
-              "/var/lib/cobbler/loaders/pxelinux.0" ],
-          "efi"        : [ "/var/lib/cobbler/loaders/grub-x86.efi",
-              "/var/lib/cobbler/loaders/grub-x86_64.efi" ],
-       }
-
-       # look for bootloaders at the glob locations above
-       found_bootloaders = []
-       items = bootloaders.keys()
-       for loader_name in items:
-          patterns = bootloaders[loader_name]
-          for pattern in patterns:
-             matches = glob.glob(pattern)
-             if len(matches) > 0:
-                 found_bootloaders.append(loader_name)
-       not_found = []
-
-       # invert the list of what we've found so we can report on what we haven't found
-       for loader_name in items:
-          if loader_name not in found_bootloaders:
-             not_found.append(loader_name)
-
-       if len(not_found) > 0:
-          status.append("some network boot-loaders are missing from /var/lib/cobbler/loaders, you may run 'cobbler get-loaders' to download them, or, if you only want to handle x86/x86_64 netbooting, you may ensure that you have installed a *recent* version of the syslinux package installed and can ignore this message entirely.  Files in this directory, should you want to support all architectures, should include pxelinux.0, menu.c32, elilo.efi, and yaboot. The 'cobbler get-loaders' command is the easiest way to resolve these requirements.")
- 
-   def check_tftpd_bin(self,status):
-       """
-       Check if tftpd is installed
-       """
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       if not os.path.exists("/etc/xinetd.d/tftp"):
-          status.append("missing /etc/xinetd.d/tftp, install tftp-server?")
-
-   def check_tftpd_dir(self,status):
-       """
-       Check if cobbler.conf's tftpboot directory exists
-       """
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       bootloc = utils.tftpboot_location()
-       if not os.path.exists(bootloc):
-          status.append(_("please create directory: %(dirname)s") % { "dirname" : bootloc })
-
-
-   def check_tftpd_conf(self,status):
-       """
-       Check that configured tftpd boot directory matches with actual
-       Check that tftpd is enabled to autostart
-       """
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       if os.path.exists("/etc/xinetd.d/tftp"):
-          f = open("/etc/xinetd.d/tftp")
-          re_disable = re.compile(r'disable.*=.*yes')
-          for line in f.readlines():
-             if re_disable.search(line) and not line.strip().startswith("#"):
-                 status.append(_("change 'disable' to 'no' in %(file)s") % { "file" : "/etc/xinetd.d/tftp" })
-       else:
-          status.append("missing configuration file: /etc/xinetd.d/tftp")
-
-   def check_ctftpd_bin(self,status):
-       """
-       Check if the Cobbler tftp server is installed
-       """
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       if not os.path.exists("/etc/xinetd.d/ctftp"):
-          status.append("missing /etc/xinetd.d/ctftp")
-
-   def check_ctftpd_dir(self,status):
-       """
-       Check if cobbler.conf's tftpboot directory exists
-       """
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       bootloc = utils.tftpboot_location()
-       if not os.path.exists(bootloc):
-          status.append(_("please create directory: %(dirname)s") % { "dirname" : bootloc })
-
-   def check_ctftpd_conf(self,status):
-       """
-       Check that configured tftpd boot directory matches with actual
-       Check that tftpd is enabled to autostart
-       """
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       if os.path.exists("/etc/xinetd.d/tftp"):
-          f = open("/etc/xinetd.d/tftp")
-          re_disable = re.compile(r'disable.*=.*no')
-          for line in f.readlines():
-             if re_disable.search(line) and not line.strip().startswith("#"):
-                 status.append(_("change 'disable' to 'yes' in %(file)s") % { "file" : "/etc/xinetd.d/tftp" })
-       if os.path.exists("/etc/xinetd.d/ctftp"):
-          f = open("/etc/xinetd.d/ctftp")
-          re_disable = re.compile(r'disable.*=.*yes')
-          for line in f.readlines():
-             if re_disable.search(line) and not line.strip().startswith("#"):
-                 status.append(_("change 'disable' to 'no' in %(file)s") % { "file" : "/etc/xinetd.d/ctftp" })
-       else:
-          status.append("missing configuration file: /etc/xinetd.d/ctftp")
-
-   def check_rsync_conf(self,status):
-       """
-       Check that rsync is enabled to autostart
-       """
-       if self.checked_dist in ["debian", "ubuntu"]:
-          return
-
-       if os.path.exists("/etc/xinetd.d/rsync"):
-          f = open("/etc/xinetd.d/rsync")
-          re_disable = re.compile(r'disable.*=.*yes')
-          for line in f.readlines():
-             if re_disable.search(line) and not line.strip().startswith("#"):
-                 status.append(_("change 'disable' to 'no' in %(file)s") % { "file" : "/etc/xinetd.d/rsync" })
-       else:
-          status.append(_("file %(file)s does not exist") % { "file" : "/etc/xinetd.d/rsync" })
-
-
-   def check_dhcpd_conf(self,status):
-       """
-       NOTE: this code only applies if cobbler is *NOT* set to generate
-       a dhcp.conf file
-
-       Check that dhcpd *appears* to be configured for pxe booting.
-       We can't assure file correctness.  Since a cobbler user might
-       have dhcp on another server, it's okay if it's not there and/or
-       not configured correctly according to automated scans.
-       """
-       if not (self.settings.manage_dhcp == 0):
-           return
-
-       if os.path.exists(self.settings.dhcpd_conf):
-           match_next = False
-           match_file = False
-           f = open(self.settings.dhcpd_conf)
-           for line in f.readlines():
-               if line.find("next-server") != -1:
-                   match_next = True
-               if line.find("filename") != -1:
-                   match_file = True
-           if not match_next:
-              status.append(_("expecting next-server entry in %(file)s") % { "file" : self.settings.dhcpd_conf })
-           if not match_file:
-              status.append(_("missing file: %(file)s") % { "file" : self.settings.dhcpd_conf })
-       else:
-           status.append(_("missing file: %(file)s") % { "file" : self.settings.dhcpd_conf })
-

=== removed directory '.pc/40_ubuntu_bind9_management.patch/cobbler/modules'
=== removed file '.pc/40_ubuntu_bind9_management.patch/cobbler/modules/manage_bind.py'
--- .pc/40_ubuntu_bind9_management.patch/cobbler/modules/manage_bind.py	2011-04-18 11:15:59 +0000
+++ .pc/40_ubuntu_bind9_management.patch/cobbler/modules/manage_bind.py	1970-01-01 00:00:00 +0000
@@ -1,332 +0,0 @@
-"""
-This is some of the code behind 'cobbler sync'.
-
-Copyright 2006-2009, Red Hat, Inc
-Michael DeHaan <[e-mail]>
-John Eckersberg <[e-mail]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-"""
-
-import os
-import os.path
-import shutil
-import time
-import sys
-import glob
-import traceback
-import errno
-import re
-from shlex import shlex
-
-
-import utils
-from cexceptions import *
-import templar 
-
-import item_distro
-import item_profile
-import item_repo
-import item_system
-
-from utils import _
-
-
-def register():
-   """
-   The mandatory cobbler module registration hook.
-   """
-   return "manage"
-
-
-class BindManager:
-
-    def what(self):
-        return "bind"
-
-    def __init__(self,config,logger):
-        """
-        Constructor
-        """
-        self.logger      = logger
-        self.config      = config
-        self.api         = config.api
-        self.distros     = config.distros()
-        self.profiles    = config.profiles()
-        self.systems     = config.systems()
-        self.settings    = config.settings()
-        self.repos       = config.repos()
-        self.templar     = templar.Templar(config)
-
-    def regen_hosts(self):
-        pass # not used
-
-    def __forward_zones(self):
-        """
-        Returns a map of zones and the records that belong
-        in them
-        """
-        zones = {}
-        forward_zones = self.settings.manage_forward_zones
-        if type(forward_zones) != type([]):
-           # gracefully handle when user inputs only a single zone
-           # as a string instead of a list with only a single item
-           forward_zones = [forward_zones]
-
-        for zone in forward_zones:
-           zones[zone] = {}
-
-        for system in self.systems:
-            for (name, interface) in system.interfaces.iteritems():
-                host = interface["dns_name"]
-                ip   = interface["ip_address"]
-                if not system.is_management_supported(cidr_ok=False):
-                    continue
-                if not host or not ip:
-                    # gotsta have some dns_name and ip or else!
-                    continue
-                if host.find(".") == -1:
-                    continue
-
-                # match the longest zone!
-                # e.g. if you have a host a.b.c.d.e
-                # if manage_forward_zones has:
-                # - c.d.e
-                # - b.c.d.e
-                # then a.b.c.d.e should go in b.c.d.e
-                best_match = ''
-                for zone in zones.keys():
-                   if re.search('\.%s$' % zone, host) and len(zone) > len(best_match):
-                      best_match = zone
-
-                if best_match == '': # no match
-                   continue
-
-                # strip the zone off the dns_name and append the
-                # remainder + ip to the zone list
-                host = re.sub('\.%s$' % best_match, '', host)
-
-                zones[best_match][host] = ip
-
-        return zones
-
-    def __reverse_zones(self):
-        """
-        Returns a map of zones and the records that belong
-        in them
-        """
-        zones = {}
-        reverse_zones = self.settings.manage_reverse_zones
-        if type(reverse_zones) != type([]):
-           # gracefully handle when user inputs only a single zone
-           # as a string instead of a list with only a single item
-           reverse_zones = [reverse_zones]
-
-        for zone in reverse_zones:
-           zones[zone] = {}
-
-        for sys in self.systems:
-            for (name, interface) in sys.interfaces.iteritems():
-                host = interface["dns_name"]
-                ip   = interface["ip_address"]
-                if not sys.is_management_supported(cidr_ok=False):
-                    continue
-                if not host or not ip:
-                    # gotsta have some dns_name and ip or else!
-                    continue
-
-                # match the longest zone!
-                # e.g. if you have an ip 1.2.3.4
-                # if manage_reverse_zones has:
-                # - 1.2
-                # - 1.2.3
-                # then 1.2.3.4 should go in 1.2.3
-                best_match = ''
-                for zone in zones.keys():
-                   if re.search('^%s\.' % zone, ip) and len(zone) > len(best_match):
-                      best_match = zone
-
-                if best_match == '': # no match
-                   continue
-
-                # strip the zone off the front of the ip
-                # reverse the rest of the octets
-                # append the remainder + dns_name
-                ip = ip.replace(best_match, '', 1)
-                if ip[0] == '.': # strip leading '.' if it's there
-                   ip = ip[1:]
-                tokens = ip.split('.')
-                tokens.reverse()
-                ip = '.'.join(tokens)
-                zones[best_match][ip] = host + '.'
-
-        return zones
-
-
-    def __write_named_conf(self):
-        """
-        Write out the named.conf main config file from the template.
-        """
-        settings_file = "/etc/named.conf"
-        template_file = "/etc/cobbler/named.template"
-        forward_zones = self.settings.manage_forward_zones
-        reverse_zones = self.settings.manage_reverse_zones
-
-        metadata = {'forward_zones': self.__forward_zones().keys(),
-                    'reverse_zones': [],
-                    'zone_include': ''}
-
-        for zone in metadata['forward_zones']:
-                txt =  """
-zone "%(zone)s." {
-    type master;
-    file "%(zone)s";
-};
-""" % {'zone': zone}
-                metadata['zone_include'] = metadata['zone_include'] + txt
-
-        for zone in self.__reverse_zones().keys():
-                tokens = zone.split('.')
-                tokens.reverse()
-                arpa = '.'.join(tokens) + '.in-addr.arpa'
-                metadata['reverse_zones'].append((zone, arpa))
-                txt = """
-zone "%(arpa)s." {
-    type master;
-    file "%(zone)s";
-};
-""" % {'arpa': arpa, 'zone': zone}
-                metadata['zone_include'] = metadata['zone_include'] + txt
-
-        try:
-            f2 = open(template_file,"r")
-        except:
-            raise CX(_("error reading template from file: %s") % template_file)
-        template_data = ""
-        template_data = f2.read()
-        f2.close()
-
-        if self.logger is not None:
-            self.logger.info("generating %s" % settings_file)
-        self.templar.render(template_data, metadata, settings_file, None)
-
-    def __ip_sort(self, ips):
-        """
-        Sorts IP addresses (or partial addresses) in a numerical fashion per-octet
-        """
-        # strings to integer octet chunks so we can sort numerically
-        octets = map(lambda x: [int(i) for i in x.split('.')], ips)
-        octets.sort()
-        # integers back to strings
-        octets = map(lambda x: [str(i) for i in x], octets)
-        return ['.'.join(i) for i in octets]
-
-    def __pretty_print_host_records(self, hosts, rectype='A', rclass='IN'):
-        """
-        Format host records by order and with consistent indentation
-        """
-        names = [k for k,v in hosts.iteritems()]
-        if not names: return '' # zones with no hosts
-
-        if rectype == 'PTR':
-           names = self.__ip_sort(names)
-        else:
-           names.sort()
-
-        max_name = max([len(i) for i in names])
-
-        s = ""
-        for name in names:
-           spacing = " " * (max_name - len(name))
-           my_name = "%s%s" % (name, spacing)
-           my_host = hosts[name]
-           s += "%s  %s  %s  %s\n" % (my_name, rclass, rectype, my_host)
-        return s
-
-    def __write_zone_files(self):
-        """
-        Write out the forward and reverse zone files for all configured zones
-        """
-        default_template_file = "/etc/cobbler/zone.template"
-        cobbler_server = self.settings.server
-        serial = int(time.time())
-        forward = self.__forward_zones()
-        reverse = self.__reverse_zones()
-
-        try:
-            f2 = open(default_template_file,"r")
-        except:
-            raise CX(_("error reading template from file: %s") % default_template_file)
-        default_template_data = ""
-        default_template_data = f2.read()
-        f2.close()
-
-        for (zone, hosts) in forward.iteritems():
-            metadata = {
-                'cobbler_server': cobbler_server,
-                'serial': serial,
-                'host_record': ''
-            }
-
-            # grab zone-specific template if it exists
-            try:
-               fd = open('/etc/cobbler/zone_templates/%s' % zone)
-               template_data = fd.read()
-               fd.close()
-            except:
-               template_data = default_template_data
-
-            metadata['host_record'] = self.__pretty_print_host_records(hosts)
-
-            zonefilename='/var/named/' + zone
-            if self.logger is not None:
-               self.logger.info("generating (forward) %s" % zonefilename)
-            self.templar.render(template_data, metadata, zonefilename, None)
-
-        for (zone, hosts) in reverse.iteritems():
-            metadata = {
-                'cobbler_server': cobbler_server,
-                'serial': serial,
-                'host_record': ''
-            }
-
-            # grab zone-specific template if it exists
-            try:
-               fd = open('/etc/cobbler/zone_templates/%s' % zone)
-               template_data = fd.read()
-               fd.close()
-            except:
-               template_data = default_template_data
-
-            metadata['host_record'] = self.__pretty_print_host_records(hosts, rectype='PTR')
-
-            zonefilename='/var/named/' + zone
-            if self.logger is not None:
-               self.logger.info("generating (reverse) %s" % zonefilename)
-            self.templar.render(template_data, metadata, zonefilename, None)
-
-
-    def write_dns_files(self):
-        """
-        BIND files are written when manage_dns is set in
-        /var/lib/cobbler/settings.
-        """
-
-        self.__write_named_conf()
-        self.__write_zone_files()
-
-def get_manager(config,logger):
-    return BindManager(config,logger)

=== removed file '.pc/40_ubuntu_bind9_management.patch/cobbler/modules/sync_post_restart_services.py'
--- .pc/40_ubuntu_bind9_management.patch/cobbler/modules/sync_post_restart_services.py	2011-04-18 11:15:59 +0000
+++ .pc/40_ubuntu_bind9_management.patch/cobbler/modules/sync_post_restart_services.py	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-import distutils.sysconfig
-import sys
-import os
-import traceback
-import cexceptions
-import os
-import sys
-import xmlrpclib
-import cobbler.module_loader as module_loader
-import cobbler.utils as utils
-
-plib = distutils.sysconfig.get_python_lib()
-mod_path="%s/cobbler" % plib
-sys.path.insert(0, mod_path)
-
-def register():
-    # this pure python trigger acts as if it were a legacy shell-trigger, but is much faster.
-    # the return of this method indicates the trigger type
-    return "/var/lib/cobbler/triggers/sync/post/*"
-
-def run(api,args,logger):
-
-    settings = api.settings()
-
-    manage_dhcp        = str(settings.manage_dhcp).lower()
-    manage_dns         = str(settings.manage_dns).lower()
-    manage_tftpd       = str(settings.manage_tftpd).lower()
-    restart_dhcp       = str(settings.restart_dhcp).lower()
-    restart_dns        = str(settings.restart_dns).lower()
-
-    which_dhcp_module = module_loader.get_module_from_file("dhcp","module",just_name=True).strip()
-    which_dns_module  = module_loader.get_module_from_file("dns","module",just_name=True).strip()
-
-    # special handling as we don't want to restart it twice
-    has_restarted_dnsmasq = False
-
-    rc = 0
-    if manage_dhcp != "0":
-        if which_dhcp_module == "manage_isc":
-            if restart_dhcp != "0":
-                rc = utils.subprocess_call(logger, "dhcpd -t -q", shell=True)
-                if rc != 0:
-                   logger.error("dhcpd -t failed")
-                   return 1
-                rc = utils.subprocess_call(logger,"service isc-dhcp-server restart", shell=True)
-        elif which_dhcp_module == "manage_dnsmasq":
-            if restart_dhcp != "0":
-                rc = utils.subprocess_call(logger, "service dnsmasq restart")
-                has_restarted_dnsmasq = True
-        else:
-            logger.error("unknown DHCP engine: %s" % which_dhcp_module)
-            rc = 411
-
-    if manage_dns != "0" and restart_dns != "0":
-        if which_dns_module == "manage_bind":
-            rc = utils.subprocess_call(logger, "service named restart", shell=True)
-        elif which_dns_module == "manage_dnsmasq" and not has_restarted_dnsmasq:
-            rc = utils.subprocess_call(logger, "service dnsmasq restart", shell=True)
-        elif which_dns_module == "manage_dnsmasq" and has_restarted_dnsmasq:
-            rc = 0
-        else:
-            logger.error("unknown DNS engine: %s" % which_dns_module)
-            rc = 412
-
-    return rc
-

=== removed directory '.pc/40_ubuntu_bind9_management.patch/templates'
=== removed directory '.pc/40_ubuntu_bind9_management.patch/templates/etc'
=== removed file '.pc/40_ubuntu_bind9_management.patch/templates/etc/named.template'
--- .pc/40_ubuntu_bind9_management.patch/templates/etc/named.template	2011-04-18 11:15:59 +0000
+++ .pc/40_ubuntu_bind9_management.patch/templates/etc/named.template	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-options {
-          listen-on port 53 { 127.0.0.1; };
-          directory       "/var/named";
-          dump-file       "/var/named/data/cache_dump.db";
-          statistics-file "/var/named/data/named_stats.txt";
-          memstatistics-file "/var/named/data/named_mem_stats.txt";
-          allow-query     { localhost; };
-          recursion yes;
-};
-
-logging {
-        channel default_debug {
-                file "data/named.run";
-                severity dynamic;
-        };
-};
-
-#for $zone in $forward_zones
-zone "${zone}." {
-    type master;
-    file "$zone";
-};
-
-#end for
-#for $zone, $arpa in $reverse_zones
-zone "${arpa}." {
-    type master;
-    file "$zone";
-};
-
-#end for

=== removed directory '.pc/41_update_tree_path_with_arch.patch'
=== removed directory '.pc/41_update_tree_path_with_arch.patch/cobbler'
=== removed directory '.pc/41_update_tree_path_with_arch.patch/cobbler/modules'
=== removed file '.pc/41_update_tree_path_with_arch.patch/cobbler/modules/manage_import_debian_ubuntu.py'
--- .pc/41_update_tree_path_with_arch.patch/cobbler/modules/manage_import_debian_ubuntu.py	2011-05-02 18:26:03 +0000
+++ .pc/41_update_tree_path_with_arch.patch/cobbler/modules/manage_import_debian_ubuntu.py	1970-01-01 00:00:00 +0000
@@ -1,777 +0,0 @@
-"""
-This is some of the code behind 'cobbler sync'.
-
-Copyright 2006-2009, Red Hat, Inc
-Michael DeHaan <[e-mail]>
-John Eckersberg <[e-mail]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-"""
-
-import os
-import os.path
-import shutil
-import time
-import sys
-import glob
-import traceback
-import errno
-import re
-from utils import popen2
-from shlex import shlex
-
-
-import utils
-from cexceptions import *
-import templar
-
-import item_distro
-import item_profile
-import item_repo
-import item_system
-
-from utils import _
-
-def register():
-   """
-   The mandatory cobbler module registration hook.
-   """
-   return "manage/import"
-
-
-class ImportDebianUbuntuManager:
-
-    def __init__(self,config,logger):
-        """
-        Constructor
-        """
-        self.logger        = logger
-        self.config        = config
-        self.api           = config.api
-        self.distros       = config.distros()
-        self.profiles      = config.profiles()
-        self.systems       = config.systems()
-        self.settings      = config.settings()
-        self.repos         = config.repos()
-        self.templar       = templar.Templar(config)
-
-    # required function for import modules
-    def what(self):
-        return "import/debian_ubuntu"
-
-    # required function for import modules
-    def check_for_signature(self,path,cli_breed):
-       signatures = [
-           'pool',
-       ]
-
-       #self.logger.info("scanning %s for a debian/ubuntu distro signature" % path)
-       for signature in signatures:
-           d = os.path.join(path,signature)
-           if os.path.exists(d):
-               self.logger.info("Found a debian/ubuntu compatible signature: %s" % signature)
-               return (True,signature)
-
-       if cli_breed and cli_breed in self.get_valid_breeds():
-           self.logger.info("Warning: No distro signature for kernel at %s, using value from command line" % path)
-           return (True,None)
-
-       return (False,None)
-
-    # required function for import modules
-    def run(self,pkgdir,mirror,mirror_name,network_root=None,kickstart_file=None,rsync_flags=None,arch=None,breed=None,os_version=None):
-        self.pkgdir = pkgdir
-        self.mirror = mirror
-        self.mirror_name = mirror_name
-        self.network_root = network_root
-        self.kickstart_file = kickstart_file
-        self.rsync_flags = rsync_flags
-        self.arch = arch
-        self.breed = breed
-        self.os_version = os_version
-
-        # some fixups for the XMLRPC interface, which does not use "None"
-        if self.arch == "":           self.arch           = None
-        if self.mirror == "":         self.mirror         = None
-        if self.mirror_name == "":    self.mirror_name    = None
-        if self.kickstart_file == "": self.kickstart_file = None
-        if self.os_version == "":     self.os_version     = None
-        if self.rsync_flags == "":    self.rsync_flags    = None
-        if self.network_root == "":   self.network_root   = None
-
-        # If no breed was specified on the command line, figure it out
-        if self.breed == None:
-            self.breed = self.get_breed_from_directory()
-            if not self.breed:
-                utils.die(self.logger,"import failed - could not determine breed of debian-based distro")
-               
-        # debug log stuff for testing
-        #self.logger.info("DEBUG: self.pkgdir = %s" % str(self.pkgdir))
-        #self.logger.info("DEBUG: self.mirror = %s" % str(self.mirror))
-        #self.logger.info("DEBUG: self.mirror_name = %s" % str(self.mirror_name))
-        #self.logger.info("DEBUG: self.network_root = %s" % str(self.network_root))
-        #self.logger.info("DEBUG: self.kickstart_file = %s" % str(self.kickstart_file))
-        #self.logger.info("DEBUG: self.rsync_flags = %s" % str(self.rsync_flags))
-        #self.logger.info("DEBUG: self.arch = %s" % str(self.arch))
-        #self.logger.info("DEBUG: self.breed = %s" % str(self.breed))
-        #self.logger.info("DEBUG: self.os_version = %s" % str(self.os_version))
-
-        # both --import and --name are required arguments
-
-        if self.mirror is None:
-            utils.die(self.logger,"import failed.  no --path specified")
-        if self.mirror_name is None:
-            utils.die(self.logger,"import failed.  no --name specified")
-
-        # if --arch is supplied, validate it to ensure it's valid
-
-        if self.arch is not None and self.arch != "":
-            self.arch = self.arch.lower()
-            if self.arch == "x86":
-                # be consistent
-                self.arch = "i386"
-            if self.arch not in self.get_valid_arches():
-                utils.die(self.logger,"arch must be one of: %s" % string.join(self.get_valid_arches(),", "))
-
-        # if we're going to do any copying, set where to put things
-        # and then make sure nothing is already there.
-
-        self.path = os.path.normpath( "%s/ks_mirror/%s" % (self.settings.webdir, self.mirror_name) )
-        if os.path.exists(self.path) and self.arch is None:
-            # FIXME : Raise exception even when network_root is given ?
-            utils.die(self.logger,"Something already exists at this import location (%s).  You must specify --arch to avoid potentially overwriting existing files." % self.path)
-
-        # import takes a --kickstart for forcing selection that can't be used in all circumstances
-
-        if self.kickstart_file and not self.breed:
-            utils.die(self.logger,"Kickstart file can only be specified when a specific breed is selected")
-
-        if self.os_version and not self.breed:
-            utils.die(self.logger,"OS version can only be specified when a specific breed is selected")
-
-        if self.breed and self.breed.lower() not in self.get_valid_breeds():
-            utils.die(self.logger,"Supplied import breed is not supported by this module")
-
-        # if --arch is supplied, make sure the user is not importing a path with a different
-        # arch, which would just be silly.
-
-        if self.arch:
-            # append the arch path to the name if the arch is not already
-            # found in the name.
-            for x in self.get_valid_arches():
-                if self.path.lower().find(x) != -1:
-                    if self.arch != x :
-                        utils.die(self.logger,"Architecture found on pathname (%s) does not fit the one given in command line (%s)"%(x,self.arch))
-                    break
-            else:
-                # FIXME : This is very likely removed later at get_proposed_name, and the guessed arch appended again
-                self.path += ("-%s" % self.arch)
-
-        # make the output path and mirror content but only if not specifying that a network
-        # accessible support location already exists (this is --available-as on the command line)
-
-        if self.network_root is None:
-            # we need to mirror (copy) the files
-
-            utils.mkdir(self.path)
-
-            if self.mirror.startswith("http://") or self.mirror.startswith("ftp://") or self.mirror.startswith("nfs://"):
-
-                # http mirrors are kind of primative.  rsync is better.
-                # that's why this isn't documented in the manpage and we don't support them.
-                # TODO: how about adding recursive FTP as an option?
-
-                utils.die(self.logger,"unsupported protocol")
-
-            else:
-
-                # good, we're going to use rsync..
-                # we don't use SSH for public mirrors and local files.
-                # presence of user@host syntax means use SSH
-
-                # kick off the rsync now
-
-                if not utils.rsync_files(self.mirror, self.path, self.rsync_flags, self.logger):
-                    utils.die(self.logger, "failed to rsync the files")
-
-        else:
-
-            # rather than mirroring, we're going to assume the path is available
-            # over http, ftp, and nfs, perhaps on an external filer.  scanning still requires
-            # --mirror is a filesystem path, but --available-as marks the network path
-
-            if not os.path.exists(self.mirror):
-                utils.die(self.logger, "path does not exist: %s" % self.mirror)
-
-            # find the filesystem part of the path, after the server bits, as each distro
-            # URL needs to be calculated relative to this.
-
-            if not self.network_root.endswith("/"):
-                self.network_root = self.network_root + "/"
-            self.path = os.path.normpath( self.mirror )
-            valid_roots = [ "nfs://", "ftp://", "http://" ]
-            for valid_root in valid_roots:
-                if self.network_root.startswith(valid_root):
-                    break
-            else:
-                utils.die(self.logger, "Network root given to --available-as must be nfs://, ftp://, or http://")
-            if self.network_root.startswith("nfs://"):
-                try:
-                    (a,b,rest) = self.network_root.split(":",3)
-                except:
-                    utils.die(self.logger, "Network root given to --available-as is missing a colon, please see the manpage example.")
-
-        # now walk the filesystem looking for distributions that match certain patterns
-
-        self.logger.info("adding distros")
-        distros_added = []
-        # FIXME : search below self.path for isolinux configurations or known directories from TRY_LIST
-        os.path.walk(self.path, self.distro_adder, distros_added)
-
-        # find out if we can auto-create any repository records from the install tree
-
-        if self.network_root is None:
-            self.logger.info("associating repos")
-            # FIXME: this automagic is not possible (yet) without mirroring
-            self.repo_finder(distros_added)
-
-        # find the most appropriate answer files for each profile object
-
-        self.logger.info("associating kickstarts")
-        self.kickstart_finder(distros_added)
-
-        # ensure bootloaders are present
-        self.api.pxegen.copy_bootloaders()
-
-        return True
-
-    # required function for import modules
-    def get_valid_arches(self):
-        return ["i386", "ppc", "x86_64", "x86",]
-
-    # required function for import modules
-    def get_valid_breeds(self):
-        return ["debian","ubuntu"]
-
-    # required function for import modules
-    def get_valid_os_versions(self):
-        if self.breed == "debian":
-            return ["etch", "lenny", "squeeze", "sid", "stable", "testing", "unstable", "experimental",]
-        elif self.breed == "ubuntu":
-            return ["dapper", "hardy", "karmic", "lucid", "maverick", "natty",]
-        else:
-            return []
-
-    def get_valid_repo_breeds(self):
-        return ["apt",]
-
-    def get_release_files(self):
-        """
-        Find distro release packages.
-        """
-        return glob.glob(os.path.join(self.get_rootdir(), "dists/*"))
-
-    def get_breed_from_directory(self):
-        for breed in self.get_valid_breeds():
-            # NOTE : Although we break the loop after the first match,
-            # multiple debian derived distros can actually live at the same pool -- JP
-            d = os.path.join(self.mirror, breed)
-            if (os.path.islink(d) and os.path.isdir(d) and os.path.realpath(d) == os.path.realpath(self.mirror)) or os.path.basename(self.mirror) == breed:
-                return breed
-        else:
-            return None
-
-    def get_tree_location(self, distro):
-        """
-        Once a distribution is identified, find the part of the distribution
-        that has the URL in it that we want to use for kickstarting the
-        distribution, and create a ksmeta variable $tree that contains this.
-        """
-
-        base = self.get_rootdir()
-
-        if self.network_root is None:
-            dists_path = os.path.join(self.path, "dists")
-            if os.path.isdir(dists_path):
-                tree = "http://@@http_server@@/cblr/ks_mirror/%s" % (self.mirror_name)
-            else:
-                tree = "http://@@http_server@@/cblr/repo_mirror/%s" % (distro.name)
-            self.set_install_tree(distro, tree)
-        else:
-            # where we assign the kickstart source is relative to our current directory
-            # and the input start directory in the crawl.  We find the path segments
-            # between and tack them on the network source path to find the explicit
-            # network path to the distro that Anaconda can digest.
-            tail = self.path_tail(self.path, base)
-            tree = self.network_root[:-1] + tail
-            self.set_install_tree(distro, tree)
-
-        return
-
-    def repo_finder(self, distros_added):
-        for distro in distros_added:
-            self.logger.info("traversing distro %s" % distro.name)
-            # FIXME : Shouldn't decide this the value of self.network_root ?
-            if distro.kernel.find("ks_mirror") != -1:
-                basepath = os.path.dirname(distro.kernel)
-                top = self.get_rootdir()
-                self.logger.info("descent into %s" % top)
-                dists_path = os.path.join(self.path, "dists")
-                if not os.path.isdir(dists_path):
-                    self.process_repos()
-            else:
-                self.logger.info("this distro isn't mirrored")
-
-    def process_repos(self):
-        pass
-
-    def distro_adder(self,distros_added,dirname,fnames):
-        """
-        This is an os.path.walk routine that finds distributions in the directory
-        to be scanned and then creates them.
-        """
-
-        # FIXME: If there are more than one kernel or initrd image on the same directory,
-        # results are unpredictable
-
-        initrd = None
-        kernel = None
-
-        for x in fnames:
-            adtls = []
-
-            fullname = os.path.join(dirname,x)
-            if os.path.islink(fullname) and os.path.isdir(fullname):
-                if fullname.startswith(self.path):
-                    self.logger.warning("avoiding symlink loop")
-                    continue
-                self.logger.info("following symlink: %s" % fullname)
-                os.path.walk(fullname, self.distro_adder, distros_added)
-
-            if ( x.startswith("initrd.gz") ) and x != "initrd.size":
-                initrd = os.path.join(dirname,x)
-            if ( x.startswith("linux") ) and x.find("initrd") == -1:
-                kernel = os.path.join(dirname,x)
-
-            # if we've collected a matching kernel and initrd pair, turn the in and add them to the list
-            if initrd is not None and kernel is not None:
-                adtls.append(self.add_entry(dirname,kernel,initrd))
-                kernel = None
-                initrd = None
-
-            for adtl in adtls:
-                distros_added.extend(adtl)
-
-    def add_entry(self,dirname,kernel,initrd):
-        """
-        When we find a directory with a valid kernel/initrd in it, create the distribution objects
-        as appropriate and save them.  This includes creating xen and rescue distros/profiles
-        if possible.
-        """
-
-        proposed_name = self.get_proposed_name(dirname,kernel)
-        proposed_arch = self.get_proposed_arch(dirname)
-
-        if self.arch and proposed_arch and self.arch != proposed_arch:
-            utils.die(self.logger,"Arch from pathname (%s) does not match with supplied one %s"%(proposed_arch,self.arch))
-
-        archs = self.learn_arch_from_tree()
-        if not archs:
-            if self.arch:
-                archs.append( self.arch )
-        else:
-            if self.arch and self.arch not in archs:
-                utils.die(self.logger, "Given arch (%s) not found on imported tree %s"%(self.arch,self.get_pkgdir()))
-        if proposed_arch:
-            if archs and proposed_arch not in archs:
-                self.logger.warning("arch from pathname (%s) not found on imported tree %s" % (proposed_arch,self.get_pkgdir()))
-                return
-
-            archs = [ proposed_arch ]
-
-        if len(archs)>1:
-            self.logger.warning("- Warning : Multiple archs found : %s" % (archs))
-
-        distros_added = []
-
-        for pxe_arch in archs:
-            name = proposed_name + "-" + pxe_arch
-            existing_distro = self.distros.find(name=name)
-
-            if existing_distro is not None:
-                self.logger.warning("skipping import, as distro name already exists: %s" % name)
-                continue
-
-            else:
-                self.logger.info("creating new distro: %s" % name)
-                distro = self.config.new_distro()
-
-            if name.find("-autoboot") != -1:
-                # this is an artifact of some EL-3 imports
-                continue
-
-            distro.set_name(name)
-            distro.set_kernel(kernel)
-            distro.set_initrd(initrd)
-            distro.set_arch(pxe_arch)
-            distro.set_breed(self.breed)
-            # If a version was supplied on command line, we set it now
-            if self.os_version:
-                distro.set_os_version(self.os_version)
-
-            self.distros.add(distro,save=True)
-            distros_added.append(distro)
-
-            existing_profile = self.profiles.find(name=name)
-
-            # see if the profile name is already used, if so, skip it and
-            # do not modify the existing profile
-
-            if existing_profile is None:
-                self.logger.info("creating new profile: %s" % name)
-                #FIXME: The created profile holds a default kickstart, and should be breed specific
-                profile = self.config.new_profile()
-            else:
-                self.logger.info("skipping existing profile, name already exists: %s" % name)
-                continue
-
-            # save our minimal profile which just points to the distribution and a good
-            # default answer file
-
-            profile.set_name(name)
-            profile.set_distro(name)
-            profile.set_kickstart(self.kickstart_file)
-
-            # depending on the name of the profile we can define a good virt-type
-            # for usage with koan
-
-            if name.find("-xen") != -1:
-                profile.set_virt_type("xenpv")
-            elif name.find("vmware") != -1:
-                profile.set_virt_type("vmware")
-            else:
-                profile.set_virt_type("qemu")
-
-            # save our new profile to the collection
-
-            self.profiles.add(profile,save=True)
-
-        return distros_added
-
-    def get_proposed_name(self,dirname,kernel=None):
-        """
-        Given a directory name where we have a kernel/initrd pair, try to autoname
-        the distribution (and profile) object based on the contents of that path
-        """
-
-        if self.network_root is not None:
-            name = self.mirror_name + "-".join(self.path_tail(os.path.dirname(self.path),dirname).split("/"))
-        else:
-            # remove the part that says /var/www/cobbler/ks_mirror/name
-            name = "-".join(dirname.split("/")[5:])
-
-        if kernel is not None and kernel.find("PAE") != -1:
-            name = name + "-PAE"
-
-        # These are all Ubuntu's doing, the netboot images are buried pretty
-        # deep. ;-) -JC
-        name = name.replace("-netboot","")
-        name = name.replace("-ubuntu-installer","")
-        name = name.replace("-amd64","")
-        name = name.replace("-i386","")
-
-        # we know that some kernel paths should not be in the name
-
-        name = name.replace("-images","")
-        name = name.replace("-pxeboot","")
-        name = name.replace("-install","")
-        name = name.replace("-isolinux","")
-
-        # some paths above the media root may have extra path segments we want
-        # to clean up
-
-        name = name.replace("-os","")
-        name = name.replace("-tree","")
-        name = name.replace("var-www-cobbler-", "")
-        name = name.replace("ks_mirror-","")
-        name = name.replace("--","-")
-
-        # remove any architecture name related string, as real arch will be appended later
-
-        name = name.replace("chrp","ppc64")
-
-        for separator in [ '-' , '_'  , '.' ] :
-            for arch in [ "i386" , "x86_64" , "ia64" , "ppc64", "ppc32", "ppc", "x86" , "s390x", "s390" , "386" , "amd" ]:
-                name = name.replace("%s%s" % ( separator , arch ),"")
-
-        return name
-
-    def get_proposed_arch(self,dirname):
-        """
-        Given an directory name, can we infer an architecture from a path segment?
-        """
-        if dirname.find("x86_64") != -1 or dirname.find("amd") != -1:
-            return "x86_64"
-        if dirname.find("ia64") != -1:
-            return "ia64"
-        if dirname.find("i386") != -1 or dirname.find("386") != -1 or dirname.find("x86") != -1:
-            return "i386"
-        if dirname.find("s390x") != -1:
-            return "s390x"
-        if dirname.find("s390") != -1:
-            return "s390"
-        if dirname.find("ppc64") != -1 or dirname.find("chrp") != -1:
-            return "ppc64"
-        if dirname.find("ppc32") != -1:
-            return "ppc"
-        if dirname.find("ppc") != -1:
-            return "ppc"
-        return None
-
-    def arch_walker(self,foo,dirname,fnames):
-        """
-        See docs on learn_arch_from_tree.
-
-        The TRY_LIST is used to speed up search, and should be dropped for default importer
-        Searched kernel names are kernel-header, linux-headers-, kernel-largesmp, kernel-hugemem
-
-        This method is useful to get the archs, but also to package type and a raw guess of the breed
-        """
-
-        # try to find a kernel header RPM and then look at it's arch.
-        for x in fnames:
-            if self.match_kernelarch_file(x):
-                for arch in self.get_valid_arches():
-                    if x.find(arch) != -1:
-                        foo[arch] = 1
-                for arch in [ "i686" , "amd64" ]:
-                    if x.find(arch) != -1:
-                        foo[arch] = 1
-
-    def kickstart_finder(self,distros_added):
-        """
-        For all of the profiles in the config w/o a kickstart, use the
-        given kickstart file, or look at the kernel path, from that,
-        see if we can guess the distro, and if we can, assign a kickstart
-        if one is available for it.
-        """
-        for profile in self.profiles:
-            distro = self.distros.find(name=profile.get_conceptual_parent().name)
-            if distro is None or not (distro in distros_added):
-                continue
-
-            kdir = os.path.dirname(distro.kernel)
-            if self.kickstart_file == None:
-                for file in self.get_release_files():
-                    results = self.scan_pkg_filename(file)
-                    # FIXME : If os is not found on tree but set with CLI, no kickstart is searched
-                    if results is None:
-                        self.logger.warning("skipping %s" % file)
-                        continue
-                    (flavor, major, minor, release) = results
-                    # Why use set_variance()? scan_pkg_filename() does everything we need now - jcammarata
-                    #version , ks = self.set_variance(flavor, major, minor, distro.arch)
-                    if self.os_version:
-                        if self.os_version != flavor:
-                            utils.die(self.logger,"CLI version differs from tree : %s vs. %s" % (self.os_version,flavor))
-                    distro.set_comment("%s %s (%s.%s.%s) %s" % (self.breed,flavor,major,minor,release,self.arch))
-                    distro.set_os_version(flavor)
-                    # is this even valid for debian/ubuntu? - jcammarata
-                    #ds = self.get_datestamp()
-                    #if ds is not None:
-                    #    distro.set_tree_build_time(ds)
-                    profile.set_kickstart("/var/lib/cobbler/kickstarts/sample.seed")
-                    self.profiles.add(profile,save=True)
-
-            self.configure_tree_location(distro)
-            self.distros.add(distro,save=True) # re-save
-            self.api.serialize()
-
-    def configure_tree_location(self, distro):
-        """
-        Once a distribution is identified, find the part of the distribution
-        that has the URL in it that we want to use for kickstarting the
-        distribution, and create a ksmeta variable $tree that contains this.
-        """
-
-        base = self.get_rootdir()
-
-        if self.network_root is None:
-            dists_path = os.path.join( self.path , "dists" )
-            if os.path.isdir( dists_path ):
-                tree = "http://@@http_server@@/cblr/ks_mirror/%s" % (self.mirror_name)
-            else:
-                tree = "http://@@http_server@@/cblr/repo_mirror/%s" % (distro.name)
-            self.set_install_tree(distro, tree)
-        else:
-            # where we assign the kickstart source is relative to our current directory
-            # and the input start directory in the crawl.  We find the path segments
-            # between and tack them on the network source path to find the explicit
-            # network path to the distro that Anaconda can digest.
-            tail = utils.path_tail(self.path, base)
-            tree = self.network_root[:-1] + tail
-            self.set_install_tree(distro, tree)
-
-    def get_rootdir(self):
-        return self.mirror
-
-    def get_pkgdir(self):
-        if not self.pkgdir:
-            return None
-        return os.path.join(self.get_rootdir(),self.pkgdir)
-
-    def set_install_tree(self, distro, url):
-        distro.ks_meta["tree"] = url
-
-    def learn_arch_from_tree(self):
-        """
-        If a distribution is imported from DVD, there is a good chance the path doesn't
-        contain the arch and we should add it back in so that it's part of the
-        meaningful name ... so this code helps figure out the arch name.  This is important
-        for producing predictable distro names (and profile names) from differing import sources
-        """
-        result = {}
-        # FIXME : this is called only once, should not be a walk
-        if self.get_pkgdir():
-            os.path.walk(self.get_pkgdir(), self.arch_walker, result)
-        if result.pop("amd64",False):
-            result["x86_64"] = 1
-        if result.pop("i686",False):
-            result["i386"] = 1
-        return result.keys()
-
-    def match_kernelarch_file(self, filename):
-        """
-        Is the given filename a kernel filename?
-        """
-        if not filename.endswith("deb"):
-            return False
-        if filename.startswith("linux-headers-"):
-            return True
-        return False
-
-    def scan_pkg_filename(self, file):
-        """
-        Determine what the distro is based on the release package filename.
-        """
-        # FIXME: all of these dist_names should probably be put in a function
-        # which would be called in place of looking in codes.py.  Right now
-        # you have to update both codes.py and this to add a new release
-        if self.breed == "debian":
-            dist_names = ['etch','lenny',]
-        elif self.breed == "ubuntu":
-            dist_names = ['dapper','hardy','intrepid','jaunty','karmic','lynx','maverick','natty',]
-        else:
-            return None
-
-        if os.path.basename(file) in dist_names:
-            release_file = os.path.join(file,'Release')
-            self.logger.info("Found %s release file: %s" % (self.breed,release_file))
-
-            f = open(release_file,'r')
-            lines = f.readlines()
-            f.close()
-
-            for line in lines:
-                if line.lower().startswith('version: '):
-                    version = line.split(':')[1].strip()
-                    values = version.split('.')
-                    if len(values) == 1:
-                        # I don't think you'd ever hit this currently with debian or ubuntu,
-                        # just including it for safety reasons
-                        return (os.path.basename(file), values[0], "0", "0")
-                    elif len(values) == 2:
-                        return (os.path.basename(file), values[0], values[1], "0")
-                    elif len(values) > 2:
-                        return (os.path.basename(file), values[0], values[1], values[2])
-        return None
-
-    def get_datestamp(self):
-        """
-        Not used for debian/ubuntu... should probably be removed? - jcammarata
-        """
-        pass
-
-    def set_variance(self, flavor, major, minor, arch):
-        """
-        Set distro specific versioning.
-        """
-        # I don't think this is required anymore, as the scan_pkg_filename() function
-        # above does everything we need it to - jcammarata
-        #
-        #if self.breed == "debian":
-        #    dist_names = { '4.0' : "etch" , '5.0' : "lenny" }
-        #    dist_vers = "%s.%s" % ( major , minor )
-        #    os_version = dist_names[dist_vers]
-        #
-        #    return os_version , "/var/lib/cobbler/kickstarts/sample.seed"
-        #elif self.breed == "ubuntu":
-        #    # Release names taken from wikipedia
-        #    dist_names = { '6.4'  :"dapper", 
-        #                   '8.4'  :"hardy", 
-        #                   '8.10' :"intrepid", 
-        #                   '9.4'  :"jaunty",
-        #                   '9.10' :"karmic",
-        #                   '10.4' :"lynx",
-        #                   '10.10':"maverick",
-        #                   '11.4' :"natty",
-        #                 }
-        #    dist_vers = "%s.%s" % ( major , minor )
-        #    if not dist_names.has_key( dist_vers ):
-        #        dist_names['4ubuntu2.0'] = "IntrepidIbex"
-        #    os_version = dist_names[dist_vers]
-        # 
-        #    return os_version , "/var/lib/cobbler/kickstarts/sample.seed"
-        #else:
-        #    return None
-        pass
-
-    def process_repos(self, main_importer, distro):
-        # Create a disabled repository for the new distro, and the security updates
-        #
-        # NOTE : We cannot use ks_meta nor os_version because they get fixed at a later stage
-
-        repo = item_repo.Repo(main_importer.config)
-        repo.set_breed( "apt" )
-        repo.set_arch( distro.arch )
-        repo.set_keep_updated( False )
-        repo.yumopts["--ignore-release-gpg"] = None
-        repo.yumopts["--verbose"] = None
-        repo.set_name( distro.name )
-        repo.set_os_version( distro.os_version )
-        # NOTE : The location of the mirror should come from timezone
-        repo.set_mirror( "http://ftp.%s.debian.org/debian/dists/%s" % ( 'us' , '@@suite@@' ) )
-
-        security_repo = item_repo.Repo(main_importer.config)
-        security_repo.set_breed( "apt" )
-        security_repo.set_arch( distro.arch )
-        security_repo.set_keep_updated( False )
-        security_repo.yumopts["--ignore-release-gpg"] = None
-        security_repo.yumopts["--verbose"] = None
-        security_repo.set_name( distro.name + "-security" )
-        security_repo.set_os_version( distro.os_version )
-        # There are no official mirrors for security updates
-        security_repo.set_mirror( "http://security.debian.org/debian-security/dists/%s/updates" % '@@suite@@' )
-
-        self.logger.info("Added repos for %s" % distro.name)
-        repos  = main_importer.config.repos()
-        repos.add(repo,save=True)
-        repos.add(security_repo,save=True)
-
-# ==========================================================================
-
-def get_import_manager(config,logger):
-    return ImportDebianUbuntuManager(config,logger)

=== removed file '.pc/42_fix_repomirror_create_sync.patch/cobbler/codes.py'
--- .pc/42_fix_repomirror_create_sync.patch/cobbler/codes.py	2011-05-02 18:26:03 +0000
+++ .pc/42_fix_repomirror_create_sync.patch/cobbler/codes.py	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-
-"""
-various codes and constants used by Cobbler
-
-Copyright 2006-2009, Red Hat, Inc
-Michael DeHaan <[e-mail]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-"""
-
-import utils
-
-# OS variants table.  This is a variance of the data from 
-# ls /usr/lib/python2.X/site-packages/virtinst/FullVirtGuest.py
-# but replicated here as we can't assume cobbler is installed on a system with libvirt.
-# in many cases it will not be (i.e. old EL4 server, etc) and we need this info to
-# know how to validate --os-variant and --os-version. 
-#
-# The keys of this hash correspond with the --breed flag in Cobbler.
-# --breed has physical provisioning semantics as well as virt semantics.
-#
-# presense of something in this table does /not/ mean it's supported.
-# for instance, currently, "redhat", "debian", and "suse" do something interesting.
-# the rest are undefined (for now), this will evolve.
-
-VALID_OS_BREEDS = [
-    "redhat", "debian", "ubuntu", "suse", "generic", "windows", "unix", "vmware", "other"
-]
-
-VALID_OS_VERSIONS = {
-    "redhat"  : [ "rhel2.1", "rhel3", "rhel4", "rhel5", "rhel6", "fedora5", "fedora6", "fedora7", "fedora8", "fedora9", "fedora10", "fedora11", "fedora12", "fedora13", "fedora14", "generic24", "generic26", "virtio26", "other" ],
-    "suse"    : [ "sles10", "generic24", "generic26", "virtio26", "other" ],
-    "debian"  : [ "etch", "lenny", "squeeze", "sid", "stable", "testing", "unstable", "generic24", "generic26", "other" ],
-    "ubuntu"  : [ "dapper", "hardy", "intrepid", "jaunty", "karmic", "lucid", "maverick", "natty" ],
-    "generic" : [ "generic24", "generic26", "other" ],
-    "windows" : [ "winxp", "win2k", "win2k3", "vista", "other" ],
-    "unix"    : [ "solaris9", "solaris10", "freebsd6", "openbsd4", "other" ],
-    "vmware"  : [ "esx4", "esxi4" ],
-    "other"   : [ "msdos", "netware4", "netware5", "netware6", "generic", "other" ]
-}
-
-VALID_REPO_BREEDS = [
-#    "rsync", "rhn", "yum", "apt"
-     "rsync", "rhn", "yum"
-]
-
-def uniquify(seq, idfun=None):
-
-    # this is odd (older mod_python scoping bug?) but we can't use 
-    # utils.uniquify here because on older distros (RHEL4/5) 
-    # mod_python gets another utils.  As a result,
-    # it is duplicated here for now.  Bad, but ... now you know.
-    #
-    # credit: http://www.peterbe.com/plog/uniqifiers-benchmark
-    # FIXME: if this is actually slower than some other way, overhaul it
-
-    if idfun is None:
-        def idfun(x):
-           return x
-    seen = {}
-    result = []
-    for item in seq:
-        marker = idfun(item)
-        if marker in seen:
-            continue
-        seen[marker] = 1
-        result.append(item)
-    return result
-
-
-def get_all_os_versions():
-   """
-   Collapse the above list of OS versions for usage/display by the CLI/webapp.
-   """
-   results = ['']
-   for x in VALID_OS_VERSIONS.keys():
-      for y in VALID_OS_VERSIONS[x]:
-         results.append(y)
-
-   results = uniquify(results)
-
-   results.sort()
-   return results
-
-

=== removed directory '.pc/42_fix_repomirror_create_sync.patch/cobbler/modules'
=== removed file '.pc/42_fix_repomirror_create_sync.patch/cobbler/modules/manage_import_debian_ubuntu.py'
--- .pc/42_fix_repomirror_create_sync.patch/cobbler/modules/manage_import_debian_ubuntu.py	2011-05-02 18:26:03 +0000
+++ .pc/42_fix_repomirror_create_sync.patch/cobbler/modules/manage_import_debian_ubuntu.py	1970-01-01 00:00:00 +0000
@@ -1,779 +0,0 @@
-"""
-This is some of the code behind 'cobbler sync'.
-
-Copyright 2006-2009, Red Hat, Inc
-Michael DeHaan <[e-mail]>
-John Eckersberg <[e-mail]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-"""
-
-import os
-import os.path
-import shutil
-import time
-import sys
-import glob
-import traceback
-import errno
-import re
-from utils import popen2
-from shlex import shlex
-
-
-import utils
-from cexceptions import *
-import templar
-
-import item_distro
-import item_profile
-import item_repo
-import item_system
-
-from utils import _
-
-def register():
-   """
-   The mandatory cobbler module registration hook.
-   """
-   return "manage/import"
-
-
-class ImportDebianUbuntuManager:
-
-    def __init__(self,config,logger):
-        """
-        Constructor
-        """
-        self.logger        = logger
-        self.config        = config
-        self.api           = config.api
-        self.distros       = config.distros()
-        self.profiles      = config.profiles()
-        self.systems       = config.systems()
-        self.settings      = config.settings()
-        self.repos         = config.repos()
-        self.templar       = templar.Templar(config)
-
-    # required function for import modules
-    def what(self):
-        return "import/debian_ubuntu"
-
-    # required function for import modules
-    def check_for_signature(self,path,cli_breed):
-       signatures = [
-           'pool',
-       ]
-
-       #self.logger.info("scanning %s for a debian/ubuntu distro signature" % path)
-       for signature in signatures:
-           d = os.path.join(path,signature)
-           if os.path.exists(d):
-               self.logger.info("Found a debian/ubuntu compatible signature: %s" % signature)
-               return (True,signature)
-
-       if cli_breed and cli_breed in self.get_valid_breeds():
-           self.logger.info("Warning: No distro signature for kernel at %s, using value from command line" % path)
-           return (True,None)
-
-       return (False,None)
-
-    # required function for import modules
-    def run(self,pkgdir,mirror,mirror_name,network_root=None,kickstart_file=None,rsync_flags=None,arch=None,breed=None,os_version=None):
-        self.pkgdir = pkgdir
-        self.mirror = mirror
-        self.mirror_name = mirror_name
-        self.network_root = network_root
-        self.kickstart_file = kickstart_file
-        self.rsync_flags = rsync_flags
-        self.arch = arch
-        self.breed = breed
-        self.os_version = os_version
-
-        # some fixups for the XMLRPC interface, which does not use "None"
-        if self.arch == "":           self.arch           = None
-        if self.mirror == "":         self.mirror         = None
-        if self.mirror_name == "":    self.mirror_name    = None
-        if self.kickstart_file == "": self.kickstart_file = None
-        if self.os_version == "":     self.os_version     = None
-        if self.rsync_flags == "":    self.rsync_flags    = None
-        if self.network_root == "":   self.network_root   = None
-
-        # If no breed was specified on the command line, figure it out
-        if self.breed == None:
-            self.breed = self.get_breed_from_directory()
-            if not self.breed:
-                utils.die(self.logger,"import failed - could not determine breed of debian-based distro")
-               
-        # debug log stuff for testing
-        #self.logger.info("DEBUG: self.pkgdir = %s" % str(self.pkgdir))
-        #self.logger.info("DEBUG: self.mirror = %s" % str(self.mirror))
-        #self.logger.info("DEBUG: self.mirror_name = %s" % str(self.mirror_name))
-        #self.logger.info("DEBUG: self.network_root = %s" % str(self.network_root))
-        #self.logger.info("DEBUG: self.kickstart_file = %s" % str(self.kickstart_file))
-        #self.logger.info("DEBUG: self.rsync_flags = %s" % str(self.rsync_flags))
-        #self.logger.info("DEBUG: self.arch = %s" % str(self.arch))
-        #self.logger.info("DEBUG: self.breed = %s" % str(self.breed))
-        #self.logger.info("DEBUG: self.os_version = %s" % str(self.os_version))
-
-        # both --import and --name are required arguments
-
-        if self.mirror is None:
-            utils.die(self.logger,"import failed.  no --path specified")
-        if self.mirror_name is None:
-            utils.die(self.logger,"import failed.  no --name specified")
-
-        # if --arch is supplied, validate it to ensure it's valid
-
-        if self.arch is not None and self.arch != "":
-            self.arch = self.arch.lower()
-            if self.arch == "x86":
-                # be consistent
-                self.arch = "i386"
-            if self.arch not in self.get_valid_arches():
-                utils.die(self.logger,"arch must be one of: %s" % string.join(self.get_valid_arches(),", "))
-
-        # if we're going to do any copying, set where to put things
-        # and then make sure nothing is already there.
-
-        self.path = os.path.normpath( "%s/ks_mirror/%s" % (self.settings.webdir, self.mirror_name) )
-        if os.path.exists(self.path) and self.arch is None:
-            # FIXME : Raise exception even when network_root is given ?
-            utils.die(self.logger,"Something already exists at this import location (%s).  You must specify --arch to avoid potentially overwriting existing files." % self.path)
-
-        # import takes a --kickstart for forcing selection that can't be used in all circumstances
-
-        if self.kickstart_file and not self.breed:
-            utils.die(self.logger,"Kickstart file can only be specified when a specific breed is selected")
-
-        if self.os_version and not self.breed:
-            utils.die(self.logger,"OS version can only be specified when a specific breed is selected")
-
-        if self.breed and self.breed.lower() not in self.get_valid_breeds():
-            utils.die(self.logger,"Supplied import breed is not supported by this module")
-
-        # if --arch is supplied, make sure the user is not importing a path with a different
-        # arch, which would just be silly.
-
-        if self.arch:
-            # append the arch path to the name if the arch is not already
-            # found in the name.
-            for x in self.get_valid_arches():
-                if self.path.lower().find(x) != -1:
-                    if self.arch != x :
-                        utils.die(self.logger,"Architecture found on pathname (%s) does not fit the one given in command line (%s)"%(x,self.arch))
-                    break
-            else:
-                # FIXME : This is very likely removed later at get_proposed_name, and the guessed arch appended again
-                self.path += ("-%s" % self.arch)
-                # If arch is specified we also need to update the mirror name.
-                self.mirror_name = self.mirror_name + "-" + self.arch
-
-        # make the output path and mirror content but only if not specifying that a network
-        # accessible support location already exists (this is --available-as on the command line)
-
-        if self.network_root is None:
-            # we need to mirror (copy) the files
-
-            utils.mkdir(self.path)
-
-            if self.mirror.startswith("http://") or self.mirror.startswith("ftp://") or self.mirror.startswith("nfs://"):
-
-                # http mirrors are kind of primative.  rsync is better.
-                # that's why this isn't documented in the manpage and we don't support them.
-                # TODO: how about adding recursive FTP as an option?
-
-                utils.die(self.logger,"unsupported protocol")
-
-            else:
-
-                # good, we're going to use rsync..
-                # we don't use SSH for public mirrors and local files.
-                # presence of user@host syntax means use SSH
-
-                # kick off the rsync now
-
-                if not utils.rsync_files(self.mirror, self.path, self.rsync_flags, self.logger):
-                    utils.die(self.logger, "failed to rsync the files")
-
-        else:
-
-            # rather than mirroring, we're going to assume the path is available
-            # over http, ftp, and nfs, perhaps on an external filer.  scanning still requires
-            # --mirror is a filesystem path, but --available-as marks the network path
-
-            if not os.path.exists(self.mirror):
-                utils.die(self.logger, "path does not exist: %s" % self.mirror)
-
-            # find the filesystem part of the path, after the server bits, as each distro
-            # URL needs to be calculated relative to this.
-
-            if not self.network_root.endswith("/"):
-                self.network_root = self.network_root + "/"
-            self.path = os.path.normpath( self.mirror )
-            valid_roots = [ "nfs://", "ftp://", "http://" ]
-            for valid_root in valid_roots:
-                if self.network_root.startswith(valid_root):
-                    break
-            else:
-                utils.die(self.logger, "Network root given to --available-as must be nfs://, ftp://, or http://")
-            if self.network_root.startswith("nfs://"):
-                try:
-                    (a,b,rest) = self.network_root.split(":",3)
-                except:
-                    utils.die(self.logger, "Network root given to --available-as is missing a colon, please see the manpage example.")
-
-        # now walk the filesystem looking for distributions that match certain patterns
-
-        self.logger.info("adding distros")
-        distros_added = []
-        # FIXME : search below self.path for isolinux configurations or known directories from TRY_LIST
-        os.path.walk(self.path, self.distro_adder, distros_added)
-
-        # find out if we can auto-create any repository records from the install tree
-
-        if self.network_root is None:
-            self.logger.info("associating repos")
-            # FIXME: this automagic is not possible (yet) without mirroring
-            self.repo_finder(distros_added)
-
-        # find the most appropriate answer files for each profile object
-
-        self.logger.info("associating kickstarts")
-        self.kickstart_finder(distros_added)
-
-        # ensure bootloaders are present
-        self.api.pxegen.copy_bootloaders()
-
-        return True
-
-    # required function for import modules
-    def get_valid_arches(self):
-        return ["i386", "ppc", "x86_64", "x86",]
-
-    # required function for import modules
-    def get_valid_breeds(self):
-        return ["debian","ubuntu"]
-
-    # required function for import modules
-    def get_valid_os_versions(self):
-        if self.breed == "debian":
-            return ["etch", "lenny", "squeeze", "sid", "stable", "testing", "unstable", "experimental",]
-        elif self.breed == "ubuntu":
-            return ["dapper", "hardy", "karmic", "lucid", "maverick", "natty",]
-        else:
-            return []
-
-    def get_valid_repo_breeds(self):
-        return ["apt",]
-
-    def get_release_files(self):
-        """
-        Find distro release packages.
-        """
-        return glob.glob(os.path.join(self.get_rootdir(), "dists/*"))
-
-    def get_breed_from_directory(self):
-        for breed in self.get_valid_breeds():
-            # NOTE : Although we break the loop after the first match,
-            # multiple debian derived distros can actually live at the same pool -- JP
-            d = os.path.join(self.mirror, breed)
-            if (os.path.islink(d) and os.path.isdir(d) and os.path.realpath(d) == os.path.realpath(self.mirror)) or os.path.basename(self.mirror) == breed:
-                return breed
-        else:
-            return None
-
-    def get_tree_location(self, distro):
-        """
-        Once a distribution is identified, find the part of the distribution
-        that has the URL in it that we want to use for kickstarting the
-        distribution, and create a ksmeta variable $tree that contains this.
-        """
-
-        base = self.get_rootdir()
-
-        if self.network_root is None:
-            dists_path = os.path.join(self.path, "dists")
-            if os.path.isdir(dists_path):
-                tree = "http://@@http_server@@/cblr/ks_mirror/%s" % (self.mirror_name)
-            else:
-                tree = "http://@@http_server@@/cblr/repo_mirror/%s" % (distro.name)
-            self.set_install_tree(distro, tree)
-        else:
-            # where we assign the kickstart source is relative to our current directory
-            # and the input start directory in the crawl.  We find the path segments
-            # between and tack them on the network source path to find the explicit
-            # network path to the distro that Anaconda can digest.
-            tail = self.path_tail(self.path, base)
-            tree = self.network_root[:-1] + tail
-            self.set_install_tree(distro, tree)
-
-        return
-
-    def repo_finder(self, distros_added):
-        for distro in distros_added:
-            self.logger.info("traversing distro %s" % distro.name)
-            # FIXME : Shouldn't decide this the value of self.network_root ?
-            if distro.kernel.find("ks_mirror") != -1:
-                basepath = os.path.dirname(distro.kernel)
-                top = self.get_rootdir()
-                self.logger.info("descent into %s" % top)
-                dists_path = os.path.join(self.path, "dists")
-                if not os.path.isdir(dists_path):
-                    self.process_repos()
-            else:
-                self.logger.info("this distro isn't mirrored")
-
-    def process_repos(self):
-        pass
-
-    def distro_adder(self,distros_added,dirname,fnames):
-        """
-        This is an os.path.walk routine that finds distributions in the directory
-        to be scanned and then creates them.
-        """
-
-        # FIXME: If there are more than one kernel or initrd image on the same directory,
-        # results are unpredictable
-
-        initrd = None
-        kernel = None
-
-        for x in fnames:
-            adtls = []
-
-            fullname = os.path.join(dirname,x)
-            if os.path.islink(fullname) and os.path.isdir(fullname):
-                if fullname.startswith(self.path):
-                    self.logger.warning("avoiding symlink loop")
-                    continue
-                self.logger.info("following symlink: %s" % fullname)
-                os.path.walk(fullname, self.distro_adder, distros_added)
-
-            if ( x.startswith("initrd.gz") ) and x != "initrd.size":
-                initrd = os.path.join(dirname,x)
-            if ( x.startswith("linux") ) and x.find("initrd") == -1:
-                kernel = os.path.join(dirname,x)
-
-            # if we've collected a matching kernel and initrd pair, turn the in and add them to the list
-            if initrd is not None and kernel is not None:
-                adtls.append(self.add_entry(dirname,kernel,initrd))
-                kernel = None
-                initrd = None
-
-            for adtl in adtls:
-                distros_added.extend(adtl)
-
-    def add_entry(self,dirname,kernel,initrd):
-        """
-        When we find a directory with a valid kernel/initrd in it, create the distribution objects
-        as appropriate and save them.  This includes creating xen and rescue distros/profiles
-        if possible.
-        """
-
-        proposed_name = self.get_proposed_name(dirname,kernel)
-        proposed_arch = self.get_proposed_arch(dirname)
-
-        if self.arch and proposed_arch and self.arch != proposed_arch:
-            utils.die(self.logger,"Arch from pathname (%s) does not match with supplied one %s"%(proposed_arch,self.arch))
-
-        archs = self.learn_arch_from_tree()
-        if not archs:
-            if self.arch:
-                archs.append( self.arch )
-        else:
-            if self.arch and self.arch not in archs:
-                utils.die(self.logger, "Given arch (%s) not found on imported tree %s"%(self.arch,self.get_pkgdir()))
-        if proposed_arch:
-            if archs and proposed_arch not in archs:
-                self.logger.warning("arch from pathname (%s) not found on imported tree %s" % (proposed_arch,self.get_pkgdir()))
-                return
-
-            archs = [ proposed_arch ]
-
-        if len(archs)>1:
-            self.logger.warning("- Warning : Multiple archs found : %s" % (archs))
-
-        distros_added = []
-
-        for pxe_arch in archs:
-            name = proposed_name + "-" + pxe_arch
-            existing_distro = self.distros.find(name=name)
-
-            if existing_distro is not None:
-                self.logger.warning("skipping import, as distro name already exists: %s" % name)
-                continue
-
-            else:
-                self.logger.info("creating new distro: %s" % name)
-                distro = self.config.new_distro()
-
-            if name.find("-autoboot") != -1:
-                # this is an artifact of some EL-3 imports
-                continue
-
-            distro.set_name(name)
-            distro.set_kernel(kernel)
-            distro.set_initrd(initrd)
-            distro.set_arch(pxe_arch)
-            distro.set_breed(self.breed)
-            # If a version was supplied on command line, we set it now
-            if self.os_version:
-                distro.set_os_version(self.os_version)
-
-            self.distros.add(distro,save=True)
-            distros_added.append(distro)
-
-            existing_profile = self.profiles.find(name=name)
-
-            # see if the profile name is already used, if so, skip it and
-            # do not modify the existing profile
-
-            if existing_profile is None:
-                self.logger.info("creating new profile: %s" % name)
-                #FIXME: The created profile holds a default kickstart, and should be breed specific
-                profile = self.config.new_profile()
-            else:
-                self.logger.info("skipping existing profile, name already exists: %s" % name)
-                continue
-
-            # save our minimal profile which just points to the distribution and a good
-            # default answer file
-
-            profile.set_name(name)
-            profile.set_distro(name)
-            profile.set_kickstart(self.kickstart_file)
-
-            # depending on the name of the profile we can define a good virt-type
-            # for usage with koan
-
-            if name.find("-xen") != -1:
-                profile.set_virt_type("xenpv")
-            elif name.find("vmware") != -1:
-                profile.set_virt_type("vmware")
-            else:
-                profile.set_virt_type("qemu")
-
-            # save our new profile to the collection
-
-            self.profiles.add(profile,save=True)
-
-        return distros_added
-
-    def get_proposed_name(self,dirname,kernel=None):
-        """
-        Given a directory name where we have a kernel/initrd pair, try to autoname
-        the distribution (and profile) object based on the contents of that path
-        """
-
-        if self.network_root is not None:
-            name = self.mirror_name + "-".join(self.path_tail(os.path.dirname(self.path),dirname).split("/"))
-        else:
-            # remove the part that says /var/www/cobbler/ks_mirror/name
-            name = "-".join(dirname.split("/")[5:])
-
-        if kernel is not None and kernel.find("PAE") != -1:
-            name = name + "-PAE"
-
-        # These are all Ubuntu's doing, the netboot images are buried pretty
-        # deep. ;-) -JC
-        name = name.replace("-netboot","")
-        name = name.replace("-ubuntu-installer","")
-        name = name.replace("-amd64","")
-        name = name.replace("-i386","")
-
-        # we know that some kernel paths should not be in the name
-
-        name = name.replace("-images","")
-        name = name.replace("-pxeboot","")
-        name = name.replace("-install","")
-        name = name.replace("-isolinux","")
-
-        # some paths above the media root may have extra path segments we want
-        # to clean up
-
-        name = name.replace("-os","")
-        name = name.replace("-tree","")
-        name = name.replace("var-www-cobbler-", "")
-        name = name.replace("ks_mirror-","")
-        name = name.replace("--","-")
-
-        # remove any architecture name related string, as real arch will be appended later
-
-        name = name.replace("chrp","ppc64")
-
-        for separator in [ '-' , '_'  , '.' ] :
-            for arch in [ "i386" , "x86_64" , "ia64" , "ppc64", "ppc32", "ppc", "x86" , "s390x", "s390" , "386" , "amd" ]:
-                name = name.replace("%s%s" % ( separator , arch ),"")
-
-        return name
-
-    def get_proposed_arch(self,dirname):
-        """
-        Given an directory name, can we infer an architecture from a path segment?
-        """
-        if dirname.find("x86_64") != -1 or dirname.find("amd") != -1:
-            return "x86_64"
-        if dirname.find("ia64") != -1:
-            return "ia64"
-        if dirname.find("i386") != -1 or dirname.find("386") != -1 or dirname.find("x86") != -1:
-            return "i386"
-        if dirname.find("s390x") != -1:
-            return "s390x"
-        if dirname.find("s390") != -1:
-            return "s390"
-        if dirname.find("ppc64") != -1 or dirname.find("chrp") != -1:
-            return "ppc64"
-        if dirname.find("ppc32") != -1:
-            return "ppc"
-        if dirname.find("ppc") != -1:
-            return "ppc"
-        return None
-
-    def arch_walker(self,foo,dirname,fnames):
-        """
-        See docs on learn_arch_from_tree.
-
-        The TRY_LIST is used to speed up search, and should be dropped for default importer
-        Searched kernel names are kernel-header, linux-headers-, kernel-largesmp, kernel-hugemem
-
-        This method is useful to get the archs, but also to package type and a raw guess of the breed
-        """
-
-        # try to find a kernel header RPM and then look at it's arch.
-        for x in fnames:
-            if self.match_kernelarch_file(x):
-                for arch in self.get_valid_arches():
-                    if x.find(arch) != -1:
-                        foo[arch] = 1
-                for arch in [ "i686" , "amd64" ]:
-                    if x.find(arch) != -1:
-                        foo[arch] = 1
-
-    def kickstart_finder(self,distros_added):
-        """
-        For all of the profiles in the config w/o a kickstart, use the
-        given kickstart file, or look at the kernel path, from that,
-        see if we can guess the distro, and if we can, assign a kickstart
-        if one is available for it.
-        """
-        for profile in self.profiles:
-            distro = self.distros.find(name=profile.get_conceptual_parent().name)
-            if distro is None or not (distro in distros_added):
-                continue
-
-            kdir = os.path.dirname(distro.kernel)
-            if self.kickstart_file == None:
-                for file in self.get_release_files():
-                    results = self.scan_pkg_filename(file)
-                    # FIXME : If os is not found on tree but set with CLI, no kickstart is searched
-                    if results is None:
-                        self.logger.warning("skipping %s" % file)
-                        continue
-                    (flavor, major, minor, release) = results
-                    # Why use set_variance()? scan_pkg_filename() does everything we need now - jcammarata
-                    #version , ks = self.set_variance(flavor, major, minor, distro.arch)
-                    if self.os_version:
-                        if self.os_version != flavor:
-                            utils.die(self.logger,"CLI version differs from tree : %s vs. %s" % (self.os_version,flavor))
-                    distro.set_comment("%s %s (%s.%s.%s) %s" % (self.breed,flavor,major,minor,release,self.arch))
-                    distro.set_os_version(flavor)
-                    # is this even valid for debian/ubuntu? - jcammarata
-                    #ds = self.get_datestamp()
-                    #if ds is not None:
-                    #    distro.set_tree_build_time(ds)
-                    profile.set_kickstart("/var/lib/cobbler/kickstarts/sample.seed")
-                    self.profiles.add(profile,save=True)
-
-            self.configure_tree_location(distro)
-            self.distros.add(distro,save=True) # re-save
-            self.api.serialize()
-
-    def configure_tree_location(self, distro):
-        """
-        Once a distribution is identified, find the part of the distribution
-        that has the URL in it that we want to use for kickstarting the
-        distribution, and create a ksmeta variable $tree that contains this.
-        """
-
-        base = self.get_rootdir()
-
-        if self.network_root is None:
-            dists_path = os.path.join( self.path , "dists" )
-            if os.path.isdir( dists_path ):
-                tree = "http://@@http_server@@/cblr/ks_mirror/%s" % (self.mirror_name)
-            else:
-                tree = "http://@@http_server@@/cblr/repo_mirror/%s" % (distro.name)
-            self.set_install_tree(distro, tree)
-        else:
-            # where we assign the kickstart source is relative to our current directory
-            # and the input start directory in the crawl.  We find the path segments
-            # between and tack them on the network source path to find the explicit
-            # network path to the distro that Anaconda can digest.
-            tail = utils.path_tail(self.path, base)
-            tree = self.network_root[:-1] + tail
-            self.set_install_tree(distro, tree)
-
-    def get_rootdir(self):
-        return self.mirror
-
-    def get_pkgdir(self):
-        if not self.pkgdir:
-            return None
-        return os.path.join(self.get_rootdir(),self.pkgdir)
-
-    def set_install_tree(self, distro, url):
-        distro.ks_meta["tree"] = url
-
-    def learn_arch_from_tree(self):
-        """
-        If a distribution is imported from DVD, there is a good chance the path doesn't
-        contain the arch and we should add it back in so that it's part of the
-        meaningful name ... so this code helps figure out the arch name.  This is important
-        for producing predictable distro names (and profile names) from differing import sources
-        """
-        result = {}
-        # FIXME : this is called only once, should not be a walk
-        if self.get_pkgdir():
-            os.path.walk(self.get_pkgdir(), self.arch_walker, result)
-        if result.pop("amd64",False):
-            result["x86_64"] = 1
-        if result.pop("i686",False):
-            result["i386"] = 1
-        return result.keys()
-
-    def match_kernelarch_file(self, filename):
-        """
-        Is the given filename a kernel filename?
-        """
-        if not filename.endswith("deb"):
-            return False
-        if filename.startswith("linux-headers-"):
-            return True
-        return False
-
-    def scan_pkg_filename(self, file):
-        """
-        Determine what the distro is based on the release package filename.
-        """
-        # FIXME: all of these dist_names should probably be put in a function
-        # which would be called in place of looking in codes.py.  Right now
-        # you have to update both codes.py and this to add a new release
-        if self.breed == "debian":
-            dist_names = ['etch','lenny',]
-        elif self.breed == "ubuntu":
-            dist_names = ['dapper','hardy','intrepid','jaunty','karmic','lynx','maverick','natty',]
-        else:
-            return None
-
-        if os.path.basename(file) in dist_names:
-            release_file = os.path.join(file,'Release')
-            self.logger.info("Found %s release file: %s" % (self.breed,release_file))
-
-            f = open(release_file,'r')
-            lines = f.readlines()
-            f.close()
-
-            for line in lines:
-                if line.lower().startswith('version: '):
-                    version = line.split(':')[1].strip()
-                    values = version.split('.')
-                    if len(values) == 1:
-                        # I don't think you'd ever hit this currently with debian or ubuntu,
-                        # just including it for safety reasons
-                        return (os.path.basename(file), values[0], "0", "0")
-                    elif len(values) == 2:
-                        return (os.path.basename(file), values[0], values[1], "0")
-                    elif len(values) > 2:
-                        return (os.path.basename(file), values[0], values[1], values[2])
-        return None
-
-    def get_datestamp(self):
-        """
-        Not used for debian/ubuntu... should probably be removed? - jcammarata
-        """
-        pass
-
-    def set_variance(self, flavor, major, minor, arch):
-        """
-        Set distro specific versioning.
-        """
-        # I don't think this is required anymore, as the scan_pkg_filename() function
-        # above does everything we need it to - jcammarata
-        #
-        #if self.breed == "debian":
-        #    dist_names = { '4.0' : "etch" , '5.0' : "lenny" }
-        #    dist_vers = "%s.%s" % ( major , minor )
-        #    os_version = dist_names[dist_vers]
-        #
-        #    return os_version , "/var/lib/cobbler/kickstarts/sample.seed"
-        #elif self.breed == "ubuntu":
-        #    # Release names taken from wikipedia
-        #    dist_names = { '6.4'  :"dapper", 
-        #                   '8.4'  :"hardy", 
-        #                   '8.10' :"intrepid", 
-        #                   '9.4'  :"jaunty",
-        #                   '9.10' :"karmic",
-        #                   '10.4' :"lynx",
-        #                   '10.10':"maverick",
-        #                   '11.4' :"natty",
-        #                 }
-        #    dist_vers = "%s.%s" % ( major , minor )
-        #    if not dist_names.has_key( dist_vers ):
-        #        dist_names['4ubuntu2.0'] = "IntrepidIbex"
-        #    os_version = dist_names[dist_vers]
-        # 
-        #    return os_version , "/var/lib/cobbler/kickstarts/sample.seed"
-        #else:
-        #    return None
-        pass
-
-    def process_repos(self, main_importer, distro):
-        # Create a disabled repository for the new distro, and the security updates
-        #
-        # NOTE : We cannot use ks_meta nor os_version because they get fixed at a later stage
-
-        repo = item_repo.Repo(main_importer.config)
-        repo.set_breed( "apt" )
-        repo.set_arch( distro.arch )
-        repo.set_keep_updated( False )
-        repo.yumopts["--ignore-release-gpg"] = None
-        repo.yumopts["--verbose"] = None
-        repo.set_name( distro.name )
-        repo.set_os_version( distro.os_version )
-        # NOTE : The location of the mirror should come from timezone
-        repo.set_mirror( "http://ftp.%s.debian.org/debian/dists/%s" % ( 'us' , '@@suite@@' ) )
-
-        security_repo = item_repo.Repo(main_importer.config)
-        security_repo.set_breed( "apt" )
-        security_repo.set_arch( distro.arch )
-        security_repo.set_keep_updated( False )
-        security_repo.yumopts["--ignore-release-gpg"] = None
-        security_repo.yumopts["--verbose"] = None
-        security_repo.set_name( distro.name + "-security" )
-        security_repo.set_os_version( distro.os_version )
-        # There are no official mirrors for security updates
-        security_repo.set_mirror( "http://security.debian.org/debian-security/dists/%s/updates" % '@@suite@@' )
-
-        self.logger.info("Added repos for %s" % distro.name)
-        repos  = main_importer.config.repos()
-        repos.add(repo,save=True)
-        repos.add(security_repo,save=True)
-
-# ==========================================================================
-
-def get_import_manager(config,logger):
-    return ImportDebianUbuntuManager(config,logger)

=== renamed file '.pc/43_fix_reposync_env_variable.patch/cobbler/action_reposync.py' => '.pc/43_fix_reposync_env_variable.patch/cobbler/action_reposync.py.THIS'
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-06-03 09:25:37 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-21_cobbler_use_netboot.patch
-12_fix_dhcp_restart.patch
-05_cobbler_fix_reposync_permissions.patch
-33_authn_configfile.patch
-34_fix_apache_wont_start.patch
-39_cw_remove_vhost.patch
-40_ubuntu_bind9_management.patch
-41_update_tree_path_with_arch.patch
-42_fix_repomirror_create_sync.patch
-43_fix_reposync_env_variable.patch

=== modified file 'cobbler/action_check.py'
--- cobbler/action_check.py	2011-04-18 11:15:59 +0000
+++ cobbler/action_check.py	2011-06-09 00:11:01 +0000
@@ -66,7 +66,7 @@
            mode = self.config.api.get_sync().dns.what()
            if mode == "bind":
                self.check_bind_bin(status)
-               self.check_service(status,"bind9")
+               self.check_service(status,"named")
            elif mode == "dnsmasq" and not self.settings.manage_dhcp:
                self.check_dnsmasq_bin(status)
                self.check_service(status,"dnsmasq")

=== modified file 'cobbler/action_reposync.py'
--- cobbler/action_reposync.py	2011-06-08 17:21:45 +0000
+++ cobbler/action_reposync.py	2011-06-09 00:11:01 +0000
@@ -485,11 +485,6 @@
                    arch = "amd64" # FIX potential arch errors
                 cmd = "%s --nosource -a %s" % (cmd, arch)
                     
-            # Set's an environment variable for subprocess, otherwise debmirror will fail
-            # as it needs this variable to exist.
-            # FIXME: might this break anything? So far it doesn't
-            os.putenv("HOME", "/var/lib/cobbler")
-
             rc = utils.subprocess_call(self.logger, cmd)
             if rc !=0:
                 utils.die(self.logger,"cobbler reposync failed")
@@ -569,7 +564,7 @@
         a safeguard.
         """
         # all_path = os.path.join(repo_path, "*")
-        cmd1 = "chown -R root:www-data %s" % repo_path
+        cmd1 = "chown -R root:apache %s" % repo_path
         utils.subprocess_call(self.logger, cmd1)
 
         cmd2 = "chmod -R 755 %s" % repo_path

=== modified file 'cobbler/codes.py'
--- cobbler/codes.py	2011-05-02 18:26:03 +0000
+++ cobbler/codes.py	2011-06-09 00:11:01 +0000
@@ -53,8 +53,8 @@
 }
 
 VALID_REPO_BREEDS = [
-    "rsync", "rhn", "yum", "apt"
-#   "rsync", "rhn", "yum"
+#    "rsync", "rhn", "yum", "apt"
+     "rsync", "rhn", "yum"
 ]
 
 def uniquify(seq, idfun=None):

=== modified file 'cobbler/modules/manage_bind.py'
--- cobbler/modules/manage_bind.py	2011-04-18 11:15:59 +0000
+++ cobbler/modules/manage_bind.py	2011-06-09 00:11:01 +0000
@@ -180,7 +180,7 @@
         """
         Write out the named.conf main config file from the template.
         """
-        settings_file = "/etc/bind/named.conf.local"
+        settings_file = "/etc/named.conf"
         template_file = "/etc/cobbler/named.template"
         forward_zones = self.settings.manage_forward_zones
         reverse_zones = self.settings.manage_reverse_zones
@@ -291,7 +291,7 @@
 
             metadata['host_record'] = self.__pretty_print_host_records(hosts)
 
-            zonefilename='/etc/bind/db.' + zone
+            zonefilename='/var/named/' + zone
             if self.logger is not None:
                self.logger.info("generating (forward) %s" % zonefilename)
             self.templar.render(template_data, metadata, zonefilename, None)
@@ -313,7 +313,7 @@
 
             metadata['host_record'] = self.__pretty_print_host_records(hosts, rectype='PTR')
 
-            zonefilename='/etc/bind/db.' + zone
+            zonefilename='/var/named/' + zone
             if self.logger is not None:
                self.logger.info("generating (reverse) %s" % zonefilename)
             self.templar.render(template_data, metadata, zonefilename, None)

=== modified file 'cobbler/modules/manage_import_debian_ubuntu.py'
--- cobbler/modules/manage_import_debian_ubuntu.py	2011-06-08 17:21:45 +0000
+++ cobbler/modules/manage_import_debian_ubuntu.py	2011-06-09 00:11:01 +0000
@@ -187,8 +187,6 @@
             else:
                 # FIXME : This is very likely removed later at get_proposed_name, and the guessed arch appended again
                 self.path += ("-%s" % self.arch)
-                # If arch is specified we also need to update the mirror name.
-                self.mirror_name = self.mirror_name + "-" + self.arch
 
         # make the output path and mirror content but only if not specifying that a network
         # accessible support location already exists (this is --available-as on the command line)
@@ -341,10 +339,11 @@
                 self.logger.info("descent into %s" % top)
                 dists_path = os.path.join(self.path, "dists")
                 if not os.path.isdir(dists_path):
-                    self.process_repos(self, distro)
+                    self.process_repos()
             else:
                 self.logger.info("this distro isn't mirrored")
 
+<<<<<<< TREE
     def get_repo_mirror_from_apt(self):
         """
         This tries to determine the apt mirror/archive to use (when processing repos)
@@ -364,6 +363,11 @@
 
         return mirror
 
+=======
+    def process_repos(self):
+        pass
+
+>>>>>>> MERGE-SOURCE
     def distro_adder(self,distros_added,dirname,fnames):
         """
         This is an os.path.walk routine that finds distributions in the directory
@@ -387,9 +391,9 @@
                 self.logger.info("following symlink: %s" % fullname)
                 os.path.walk(fullname, self.distro_adder, distros_added)
 
-            if ( x.startswith("initrd.gz") ) and x != "initrd.size":
+            if ( x.startswith("initrd") or x.startswith("ramdisk.image.gz") or x.startswith("vmkboot.gz") ) and x != "initrd.size":
                 initrd = os.path.join(dirname,x)
-            if ( x.startswith("linux") ) and x.find("initrd") == -1:
+            if ( x.startswith("vmlinu") or x.startswith("kernel.img") or x.startswith("linux") or x.startswith("mboot.c32") ) and x.find("initrd") == -1:
                 kernel = os.path.join(dirname,x)
 
             # if we've collected a matching kernel and initrd pair, turn the in and add them to the list
@@ -788,12 +792,17 @@
         repo.yumopts["--verbose"] = None
         repo.set_name( distro.name )
         repo.set_os_version( distro.os_version )
+<<<<<<< TREE
 
         if distro.breed == "ubuntu":
             repo.set_mirror( "%s/%s" % (mirror, distro.os_version) )
         else:
             # NOTE : The location of the mirror should come from timezone
             repo.set_mirror( "http://ftp.%s.debian.org/debian/dists/%s" % ( 'us' , distro.os_version ) )
+=======
+        # NOTE : The location of the mirror should come from timezone
+        repo.set_mirror( "http://ftp.%s.debian.org/debian/dists/%s" % ( 'us' , '@@suite@@' ) )
+>>>>>>> MERGE-SOURCE
 
         security_repo = item_repo.Repo(main_importer.config)
         security_repo.set_breed( "apt" )
@@ -804,10 +813,14 @@
         security_repo.set_name( distro.name + "-security" )
         security_repo.set_os_version( distro.os_version )
         # There are no official mirrors for security updates
+<<<<<<< TREE
         if distro.breed == "ubuntu":
             security_repo.set_mirror( "%s/%s-security" % (mirror, distro.os_version) )
         else:
             security_repo.set_mirror( "http://security.debian.org/debian-security/dists/%s/updates" % distro.os_version )
+=======
+        security_repo.set_mirror( "http://security.debian.org/debian-security/dists/%s/updates" % '@@suite@@' )
+>>>>>>> MERGE-SOURCE
 
         self.logger.info("Added repos for %s" % distro.name)
         repos  = main_importer.config.repos()

=== modified file 'cobbler/modules/sync_post_restart_services.py'
--- cobbler/modules/sync_post_restart_services.py	2011-04-18 11:15:59 +0000
+++ cobbler/modules/sync_post_restart_services.py	2011-06-09 00:11:01 +0000
@@ -42,7 +42,7 @@
                 if rc != 0:
                    logger.error("dhcpd -t failed")
                    return 1
-                rc = utils.subprocess_call(logger,"service isc-dhcp-server restart", shell=True)
+                rc = utils.subprocess_call(logger,"service dhcpd restart", shell=True)
         elif which_dhcp_module == "manage_dnsmasq":
             if restart_dhcp != "0":
                 rc = utils.subprocess_call(logger, "service dnsmasq restart")
@@ -53,7 +53,7 @@
 
     if manage_dns != "0" and restart_dns != "0":
         if which_dns_module == "manage_bind":
-            rc = utils.subprocess_call(logger, "service bind9 restart", shell=True)
+            rc = utils.subprocess_call(logger, "service named restart", shell=True)
         elif which_dns_module == "manage_dnsmasq" and not has_restarted_dnsmasq:
             rc = utils.subprocess_call(logger, "service dnsmasq restart", shell=True)
         elif which_dns_module == "manage_dnsmasq" and has_restarted_dnsmasq:

=== modified file 'config/cobbler_web.conf'
--- config/cobbler_web.conf	2011-04-15 12:47:39 +0000
+++ config/cobbler_web.conf	2011-06-09 00:11:01 +0000
@@ -1,10 +1,14 @@
 # This configuration file enables the cobbler web
 # interface (django version)
 
+<VirtualHost *:80>
+
 # Do not log the requests generated from the event notification system
 SetEnvIf Request_URI ".*/op/events/user/.*" dontlog
 # Log only what remains
-#CustomLog logs/access_log combined env=!dontlog
+CustomLog logs/access_log combined env=!dontlog
 
 WSGIScriptAlias /cobbler_web /usr/share/cobbler/web/cobbler.wsgi
 
+</VirtualHost>
+

=== modified file 'config/modules.conf'
--- config/modules.conf	2011-04-04 12:55:44 +0000
+++ config/modules.conf	2011-06-09 00:11:01 +0000
@@ -19,7 +19,7 @@
 # https://fedorahosted.org/cobbler/wiki/CobblerWithLdap
 
 [authentication]
-module = authn_configfile
+module = authn_denyall
 
 # authorization: 
 # once a user has been cleared by the WebUI/XMLRPC, what can they do?

=== modified file 'templates/etc/named.template'
--- templates/etc/named.template	2011-04-18 11:15:59 +0000
+++ templates/etc/named.template	2011-06-09 00:11:01 +0000
@@ -1,14 +1,31 @@
+options {
+          listen-on port 53 { 127.0.0.1; };
+          directory       "/var/named";
+          dump-file       "/var/named/data/cache_dump.db";
+          statistics-file "/var/named/data/named_stats.txt";
+          memstatistics-file "/var/named/data/named_mem_stats.txt";
+          allow-query     { localhost; };
+          recursion yes;
+};
+
+logging {
+        channel default_debug {
+                file "data/named.run";
+                severity dynamic;
+        };
+};
+
 #for $zone in $forward_zones
 zone "${zone}." {
     type master;
-    file "/etc/bind/db.$zone";
+    file "$zone";
 };
 
 #end for
 #for $zone, $arpa in $reverse_zones
 zone "${arpa}." {
     type master;
-    file "/etc/bind/db.$zone";
+    file "$zone";
 };
 
 #end for