diff options
| author | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-04-05 15:34:11 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-04-05 15:34:11 -0400 |
| commit | 1318f30542d8d5828577e0b5b5645457e2743d65 (patch) | |
| tree | f2c6e1654607f8bd4b78748e4d7e857e3c4a6dc2 /cobbler | |
| parent | 8962f0761a0a0962afd1efdcb4928de29e658ebf (diff) | |
| download | third_party-cobbler-1318f30542d8d5828577e0b5b5645457e2743d65.tar.gz third_party-cobbler-1318f30542d8d5828577e0b5b5645457e2743d65.tar.xz third_party-cobbler-1318f30542d8d5828577e0b5b5645457e2743d65.zip | |
Doc cleanup.
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_sync.py | 19 | ||||
| -rw-r--r-- | cobbler/settings.py | 43 |
2 files changed, 32 insertions, 30 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 4203da8..55c558f 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -415,15 +415,16 @@ class BootSync: # now install the core repos distro = self.distros.find(profile.distro) - for r in distro.source_repos: - short = r[0].split("/")[-1] - buf = buf + "wget %s --output-document=/etc/yum.repos.d/%s\n" % (r[0], short) - - # if there were any core repos, install the voodoo to disable the OS public core - # location -- FIXME: should probably run sed on the files, rather than rename them. - if len(distro.source_repos) > 0: - for x in ["fedora-core", "Centos-Base", "rhel-core"] : - buf = buf + "mv /etc/yum.repos.d/%s.repo /etc/yum.repos.d/disabled-%s\n" % (x,x) + if self.settings.yum_core_mirror_from_server: + for r in distro.source_repos: + short = r[0].split("/")[-1] + buf = buf + "wget %s --output-document=/etc/yum.repos.d/%s\n" % (r[0], short) + + # if there were any core repos, install the voodoo to disable the OS public core + # location -- FIXME: should probably run sed on the files, rather than rename them. + if len(distro.source_repos) > 0: + for x in ["fedora-core", "Centos-Base"] : + buf = buf + "test -e /etc/yum.repos.d/%s.repo && mv /etc/yum.repos.d/%s.repo /etc/yum.repos.d/disabled-%s\n" % (x,x,x) return buf diff --git a/cobbler/settings.py b/cobbler/settings.py index 9a215c4..4af8f65 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -18,29 +18,30 @@ import utils TESTMODE = False DEFAULTS = { - "httpd_bin" : "/usr/sbin/httpd", - "dhcpd_conf" : "/etc/dhcpd.conf", - "tftpd_bin" : "/usr/sbin/in.tftpd", - "server" : "127.0.0.1", - "next_server" : "127.0.0.1", - "dhcpd_bin" : "/usr/sbin/dhcpd", - "kernel_options" : { - "lang" : " ", - "text" : None, - "ksdevice" : "eth0", + "httpd_bin" : "/usr/sbin/httpd", + "dhcpd_conf" : "/etc/dhcpd.conf", + "tftpd_bin" : "/usr/sbin/in.tftpd", + "server" : "127.0.0.1", + "next_server" : "127.0.0.1", + "dhcpd_bin" : "/usr/sbin/dhcpd", + "kernel_options" : { + "lang" : " ", + "text" : None, + "ksdevice" : "eth0", }, - "tftpd_conf" : "/etc/xinetd.d/tftp", - "tftpboot" : "/tftpboot", - "webdir" : "/var/www/cobbler", - "default_kickstart" : "/etc/cobbler/default.ks", - "manage_dhcp" : 0, - "koan_path" : "", - "bootloaders" : { - "standard" : "/usr/lib/syslinux/pxelinux.0", - "ia64" : "/var/lib/cobbler/elilo-3.6-ia64.efi" + "tftpd_conf" : "/etc/xinetd.d/tftp", + "tftpboot" : "/tftpboot", + "webdir" : "/var/www/cobbler", + "default_kickstart" : "/etc/cobbler/default.ks", + "manage_dhcp" : 0, + "koan_path" : "", + "bootloaders" : { + "standard" : "/usr/lib/syslinux/pxelinux.0", + "ia64" : "/var/lib/cobbler/elilo-3.6-ia64.efi" }, - "syslog_port" : 25150, - "minimize_syncs" : 1 + "syslog_port" : 25150, + "minimize_syncs" : 1, + "yum_core_mirror_from_server" : 1 } |