diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | cobbler.pod | 6 | ||||
| -rw-r--r-- | cobbler/action_import.py | 1 | ||||
| -rw-r--r-- | cobbler/action_sync.py | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -7,6 +7,9 @@ Cobbler CHANGELOG manually editing YAML - Moving back to Cheetah for templating (old files still backwards compatible) - PXE menus for the default profile. Type "menu" at the prompt to get a menu, or wait for local boot. +- Manpage cleanup and clarification +- Bugfix: cobbler will no longer create repo files on remotes when --local-filename is not used for "repo add" + * Mon Jan 28 2007 - 0.3.9 - Make init scripts correspond with FC-E guidelines diff --git a/cobbler.pod b/cobbler.pod index 99e47af..b635cea 100644 --- a/cobbler.pod +++ b/cobbler.pod @@ -182,7 +182,7 @@ Repository mirroring is one of the more complex cobbler features, though if you a yum repository and integrate it with your provisioning, cobbler can help simplify the required knowledge a good bit. If you're just provisioning your home system, ignore this part. -B<cobbler repo add --mirror=url --mirror-name=string [--local-file=string]> +B<cobbler repo add --mirror=url --mirror-name=string [--local-filename=string]> =over @@ -220,12 +220,14 @@ it can be automatically configured on the clients. =item local-filename -Local filename specifies, for kickstarts containing the template parameter "TEMPLATE::yum_config_stanza", +Local filename specifies, for kickstarts containing the template parameter "yum_config_stanza", what files to populate on provisioned clients in /etc/yum.repos.d. In other words, if this value is "foo", the repo would be added on provisioned clients as "/etc/yum.repos.d/foo.repo". If you don't want clients to have this repo installed, don't add a name for the repo, and provisioned machines will not configure yum to know about this repo -- you can still do it manually if you choose. +See /etc/cobbler/kickstart_fc6.ks for an example of how to employ this within a kickstart template. + =back =head2 DISPLAYING CONFIGURATION ENTRIES diff --git a/cobbler/action_import.py b/cobbler/action_import.py index f61a85f..aad4756 100644 --- a/cobbler/action_import.py +++ b/cobbler/action_import.py @@ -222,6 +222,7 @@ class Importer: # they'll share same repo files. if not processed_repos.has_key(comps_path): cmd = "createrepo --groupfile %s %s" % (comps_file, comps_path) + print "- %s" % cmd sub_process.call(cmd,shell=True) print "- repository updated" processed_repos[comps_path] = 1 diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index ebf5a91..47e61ce 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -398,7 +398,7 @@ class BootSync: repo = self.repos.find(r) if repo is None: continue - if not (repo.local_filename is None and repo.local_filename != ""): + if not (repo.local_filename is None) or (repo.local_filename == ""): buf = buf + "wget http://%s/cobbler_track/repo_mirror/%s/config.repo --output-document=/etc/yum.repos.d/%s.repo\n" % (self.settings.server, repo.name, repo.local_filename) return buf |