Merge lp:~andreserl/ubuntu/natty/cobbler/lp731620 into lp:ubuntu/natty/cobbler

[Andres Rodriguez]

Unmerged revisions

2009. By Andres Rodriguez on 2011-03-11

Update patch Descriptions

2008. By Andres Rodriguez on 2011-03-11

* debian/patches/32_fix_koan_import_yum.patch: Fix import error of yum
  python module; adds flexibility for other package managers. (LP: #731620)

2007. By Andres Rodriguez on 2011-03-11

debian/patches/31_add_ubuntu_koan_utils_support.patch: Add support for ubuntu
distro in koan utils.py.

2006. By Chuck Short on 2011-03-11

New release

2005. By Chuck Short on 2011-03-11

New upstream version

2004. By Chuck Short on 2011-03-11

* New upstream release
* Add python-koan package (LP: #731616):
  - debian/control: Add python-koan binary package; fix typo
  - debian/python-cobbler.install: Do not install koan python modules.
  - debian/python-koan.install: Add. Install koan python modules.

2003. By Chuck Short on 2011-02-25

Fake changelog

2002. By Chuck Short on 2011-02-25

Update changelog

2001. By Chuck Short on 2011-02-25

New upstream release

2000. By Chuck Short on 2011-02-25

Fix up get-orig-source a bit better

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-03-11 21:10:49 +0000
@@ -0,0 +1,1 @@
+.pc
 
=== renamed file '.bzrignore' => '.bzrignore.moved'
=== added file 'AUTHORS'
--- AUTHORS	1970-01-01 00:00:00 +0000
+++ AUTHORS	2011-03-11 21:10:49 +0000
@@ -0,0 +1,95 @@
+Cobbler, Koan, and Cobbler-Web are written & maintained by:
+
+    Michael DeHaan <[e-mail]>
+
+Patches and other contributions from:
+
+    Partha Aji <[e-mail]>
+    Anton Arapov <[e-mail]>
+    Niels Basjes <[e-mail]>
+    Tim Bielawa <[e-mail]>
+    Joseph Boyer Jr. <[e-mail]>
+    Andrew Brown <[e-mail]>
+    David Brown <[e-mail]>
+    James Bowes <[e-mail]>
+    James Cammarata <[e-mail]>
+    Jasper Capel <[e-mail]>
+    C. Daniel Chase <[e-mail]>
+    Gordon Child <[e-mail]>
+    Cristian Ciupitu <[e-mail]>
+    Carsten Clasohm <[e-mail]>
+    Ian Ward Comfort <[e-mail]>
+    Rob Crittenden <[e-mail]>
+    Scott Dodson <[e-mail]>
+    Charles Duffy <[e-mail]>
+    Máirín Duffy <[e-mail]>
+    John Eckersberg <[e-mail]>
+    Lee Faus <[e-mail]>
+    Leonid Flaks <[e-mail]>
+    Eoghan Gaffney <[e-mail]>
+    Dan Guernsey <[e-mail]>
+    Marcel Haerry <[e-mail]>
+    Peter Halliday <[e-mail]>
+    Niels Hasse <[e-mail]>
+    Dave Hatton <[e-mail]>
+    Scott Henson <[e-mail]>
+    Garrett Holmstrom <[e-mail]>
+    Stephan Hauiser <[e-mail]>
+    Tru Huynh <[e-mail]>
+    Matt Hyclak <[e-mail]>
+    Mihai Ibanescu <[e-mail]>
+    Shuichi Ihara <[e-mail]>
+    Pablo Iranzo Gómez <[e-mail]>
+    Brian Kearney <[e-mail]>
+    Henry Kemp <[e-mail]>
+    Ruben Kerkhof <[e-mail]>
+    Don Khan <[e-mail]>
+    Dominic LoBue <[e-mail]>
+    Gavin Romig-Koch <[e-mail]>
+    James Laska <[e-mail]>
+    Vito Laurenza <[e-mail]>
+    Adrian Likins <[e-mail]>
+    David Lutterkort <[e-mail]>
+    Lester M. <[e-mail]>
+    Bryan Mason <[e-mail]>
+    Mike McCune <[e-mail]>
+    Mark McLoughlin <[e-mail]>
+    Jim Meyering <[e-mail]>
+    Jeroen van Meeuwen <[e-mail]>
+    Sean Millichamp <[e-mail]>
+    Perry Myers <[e-mail]>
+    Jack Neely <[e-mail]>
+    Javier Palacious <[e-mail]>
+    Bill Peck <[e-mail]>
+    Lassi Pölönen <[e-mail]>
+    Jasper Poppe <[e-mail]>
+    Dan Radez <[e-mail]>
+    Ben Riggs <[e-mail]>
+    Jeremy Rosengren <[e-mail]>
+    Adam Rosenwald <[e-mail]>
+    Christophe Sahut <[e-mail]>
+    Satoru Satoh <[e-mail]>
+    Jeff Schroeder <[e-mail]>
+    Scott Seago <[e-mail]>
+    Justin Sherill <[e-mail]>
+    Anderson Silva <[e-mail]>
+    Joe Smith <[e-mail]>
+    Michael Stahnke <[e-mail]>
+    Dylan Swift <[e-mail]>
+    Al Tobey <[e-mail]>
+    Thomas Uhde <[e-mail]>
+    Ronald van den Blink <[e-mail]>
+    Tim Verhoeven <[e-mail]>
+    John L. Villalovos <[e-mail]>
+    Peter Vreman <[e-mail]>
+    Adam Wolf <[e-mail]>
+    Simon Woolsgrove <[e-mail]>
+    Todd Zullinger <[e-mail]>
+    Kelsey Hightower <[e-mail]>
+    Chuck Short <[e-mail]>
+    Jonathan Sabo <[e-mail]>
+    Douglas Kilpatrick <[e-mail]>
+
+    [...send patches to get your name here...]
+
+
 
=== renamed file 'AUTHORS' => 'AUTHORS.moved'
=== added file 'CHANGELOG'
--- CHANGELOG	1970-01-01 00:00:00 +0000
+++ CHANGELOG	2011-03-11 21:10:49 +0000
@@ -0,0 +1,912 @@
+Cobbler CHANGELOG
+- Nov 29 2010
+- (FEAT) --force-path to overwrite virt-path file location
+
+- Apr 27 2010 - 2.0.4
+- (BUGF) fetch extra metadata from upstream repositories more safely
+- (BUGF) allow the creation of subprofiles again
+- (BUGF) don't warn needlessly when repo rpm_list is empty
+- (BUGF) run createrepo on partial yum mirrors
+- (BUGF) change default mode for new directories from 0777 to 0755
+- (BUGF) fix replication pruning to not prune systems when inappropriate
+- (BUGF) always authorize the CLI
+- (BUGF) fix passthru auth Trac#549
+- (BUGF) fix for spacewalk bug 529277
+- (BUGF) fix umask so files are not world writable
+- (BUGF) fix default pxe template to support default system record
+- (BUGF) redo the PXE menuif a profile is removed
+- (BUGF) properly escape snippets
+- (FEAT) Support Mercurial (hg) for scm tracking
+
+- Feb 15 2010 - 2.0.3.1
+- (BUGF) Fix kernel command line parsing
+
+- Feb 12 2010 - 2.0.3
+- (FEAT) API Test Framework
+- (FEAT) Cobbler4j Eclipse bindings
+- (BUGF) Trac544 Create noarch and src repos
+- (BUGF) Snippet Cleanups
+- (FEAT) Cleanup Kickstart Generation
+- (FEAT) Ability to include remote kickstart content
+- (FEAT) Koan ability for remote kickstart content
+- (BUGF) Trac547 Profile Creation in WebUI
+- (BUGF) Trac520 Sort HTML Dropdown Lists
+- (BUGF) Allow koan to use http urls for kernel/initrd
+- (FEAT) Cobbler4j now uses maven to build
+- (FEAT) Allow multiple kernel options with the same name
+- (BUGF) Various logging cleanups
+- (BUGF) Exit with proper error codes
+- (BUGF) Fix multiselect fields in the WUI
+- (BUGF) Trac550 stop leaking FDs in subprocess_call
+- (BUGF) Trac566 link distros on replicate
+- (BUGF) Trac563 Replace dos line endings with unix line endings when saving ksdata
+- (FEAT) Support RHEL6 kernel sizes
+- (BUGF) Preserve hardlinks on replicate
+- Full List 2b3a4f960b564691ca9a0470f677bd902f60b021..b99401d4dc6cf7f6c010eecf6c5d235316b59f73
+
+- Nov 23 2009 - 2.0.2
+- (FEAT) Added support for Cobbler4j
+- (FEAT) Added method for enabling autostart on qemu domains
+- (BUGF) web ui: move sessions directory to /var
+- (BUGF) Update the vlanpattern regex to cover more common virtual interface formats
+- (BUGF) cobbler check: fix BIND detection
+- (BUGF) Fix error message creating profile without a distro
+- (BUGF) use proper HTTP error codes
+- (BUGF) Create more intuitive system for displaying actions under configuration items.
+- (BUGF) Fixed hardlinking
+- (BUGF) Creating subprofile in WebUI no longer fails on default_ownership
+- (BUGF) No longer delete excluded files in reposync rsync
+- (BUGF) Add fedora12 and fedora13 as valid 'redhat' versions
+- (BUGF) Correct improper distro creation while importing i386 Fedora/RHEL.
+- (BUGF) Better messaging for invalid object errors
+- (BUGF) Added a legacy sync mechanism
+- (BUGF) No longer bundle libraries on distros where they are already available
+
+- Sep 18 2009 - 2.0.1
+- (BUGF) Fixes for image based CLI usage and object validation
+- (BUGF) Fix koan check for images ... they don't need a kickstart
+- (BUGF) Get NFS image mounting working again
+- (BUGF) Show object name on cobbler-web edit pages
+- (BUGF) Make memtest integration look in the right file locations
+- (BUGF) Fix check for dhcpd installation
+- (BUGF) Fix code to detect dhcpd config file installation
+- (BUGF) Cleaned up generated comments in settings files
+- (BUGF) Unhide per-system post-install kernel options
+- (BUGF) Unhide owners fields
+- (BUGF) Fix "cobbler profile/system dumpvars" command
+- (BUGF) Remove acl_engine reference from authz_configfile
+- (BUGF) Add "View Kickstart" link back on profile list page
+- (FEAT) Very Experimental CouchDB serializer, off by default.  Touch /etc/cobbler/use.couch
+- (BUGF) Fix pagination for webapp
+- (BUGF) Widen left column for webapp to better show controls
+- (BUGF) Workaround older mod_python scoping bug with utils.uniquify
+- (BUGF) Fix interface additions from web system edit page for new systems
+- (BUGF) Make cobbler reposync --only=N sync only that repo
+- (BUGF) Mark cobbler_web.conf config(noreplace) in the RPM specfile
+- (BUGF) Have cobbler check look for more SELinux things to do
+- (BUGF) Fix saving of "static" network field in webapp
+- (BUGF) Deepcopy interfaces to prevent copying of interface data
+ 
+- Sep 17 2009 - for 2.0 release
+- Development release start
+- (FEAT) add two new default flags to yum reposync (-m and -d) for grabbing comps automatically and also deleting duplicate RPMs
+- (BUGF) validate gateway input against python-netaddr
+- (FEAT) --kopts="~foo" --in-place can be used to delete a hash entry without affecting the others, not to be confused with "!foo" to supress it.
+- (FEAT) web app moves to Django
+- (FEAT) koan: Support for virt-autoboot feature (Xen only at this point, needs fixing)
+- (FEAT) koan: use private address range for random MACs
+- (FEAT) yum createrepo flags are now tweakable in settings
+- (FEAT) new snippet for RHN Hosted: keep RHN keys between reinstalls
+- (FEAT) allow per_distro snippets in addition to per_profile/per_system
+- (BUGF) don't add port number to http_server if it's 80.
+- (FEAT) support F11 fence-agent paths
+- (BUGF) koan autodetection now can gather MACs/IPs for bridged interfaces better
+- (FEAT) F11 and RAID support for keep_ssh_host_keys 
+- (FEAT) keep_ssh_host_keys gets F11+RAID support
+- (FEAT) per-task logging
+- (BUGF) validateks checkes /every/ kickstart, as different variables may be present
+- (FEAT) CLI now speaks XMLRPC (faster)
+- (FEAT) task engine for webapp
+- (FEAT) background APIs for all actions
+- (FEAT) look at ksdevice when building buildiso CDs to add the proper network lines
+- (BUGF) don't use RPM to check os_version, so RPM won't be called in rpm %post
+- (BUGF) deprecated omapi/omshell features for manage_isc now removed
+- (FEAT) removed configuration files for binary paths, will look for in PATH
+- (FEAT) removed configuration settings indicating where some config files are
+- (FEAT) yum priorities plugin setting for distro repos now tweakable in settings
+- (BUGF) unfinished contrib. debian import/repo support disabled until it can be finished
+- (FEAT) replicate is now greatly improved and smarter
+- (BUGF) aclengine (unfinished feature) removed, (not the same as aclsetup)
+
+- - 1.6.9
+- (FEAT/cobbler) cobbler can now pass the virtio26 os version to virtinst, so virtio drivers can be used for RHEL5
+.3 for instance
+- (BUGF/cobbler) The URL to the WebUI documentation in the manpage was corrected
+- (BUGF/cobbler) add the --nameserver option for static interfaces when defined (snippet fix)
+
+- 1.6.7
+- (BUGF/koan) Workaround for a bug in ybin, use --verbose for happy return codes
+- (BUGF/cobbler) patch to redhat_register for Satellite 
+
+1.6.6 (for more accurate listing, see release16 branch)
+- (BUGF) don't use -m option for drac unless power_id is set
+- (BUGF) don't run createrepo on reposync'd repos, it is redundant
+- (BUGF) fix error message when wrong virt ram value is applied
+- (FEAT) koan now partially works in source code form on EL 2
+- (FEAT) discover repomd filenames (for F11 and later)
+- (BUGF) Satellite also has a python module named "server" so we have to remove ours for Python imports.  This code was not used anyway.
+- (BUGF) fix typo in network config snippet
+
+- ... - 1.6.5
+- (BUGF) don't use json on python x<=2.3 since we know it's simplejson x<2.0, which has unicode issues
+- (FEAT) support F-11 imports
+- (BUGF) don't add koan virtual interfaces for vlan tagged interfaces
+- (BUGF) pair PAE and non-PAE content in imports better 
+- (BUGF) don't try to scp /etc/cobbler/*.ks on replicate, this is an old path
+- (BUGF) set proper umask on .mtime files
+- (BUGF) fix koan error with unspecified arch using --kexec
+- (BUGF) don't use --onboot=on in network config for kickstart for RHEL 3.
+- (FEAT) koan can be built on EL-2
+
+- Fri May 8 2009 - 1.6.4
+- (BUGF) empty nameserver search paths now don't screw up resolv.conf
+- (BUGF) unicode fix for --template-files feature
+- (BUGF) mod python input fix for repo/profile associations in webapp
+- (BUGF) change "hostname" to "option hostname" in dhcp.template
+- (BUGF) fixes for unicode problem with Cheetah, repos, and json
+- (BUGF) unicode fix for --template-files feature
+- (BUGF) another unicode fix
+- (BUGF) bonding interface setup for RHEL4 now works
+- (BUGF) generate DHCP info even if netboot is disabled
+- (BUGF) Change to network_config snippet to ignore bond masters to prevent anaconda failures when MAC addresses are not specified
+- (BUGF) fix to CLI rename deleting subobjects via cobblerd (important!)
+- (BUGF) fix blender cache problem with using dnsnames instead of record names (ISC DHCP management)
+- (BUGF) quote host name in stock ISC template
+
+- XXX - 1.6.3
+- (BUGF) import with datestamp 0 when .discinfo is not found, do not crash
+- (BUGF) various fixes to "cobbler report" when using non-standard formats
+- (BUGF) rename with same name does not delete
+- (BUGF) Fix for traceback when generating DHCP config and the bonding_master interface does not exist.
+- (BUGF) remove trailing newline from tokens
+- (BUGF) fix unicode handling of some fields under EL4
+- (BUGF) fix webui search error (fixed better on devel)
+- (BUGF) fix duplicate power reference
+- (BUGF) fix error message that makes it appear dnsmasq had a problem restarting, when it did not
+- (BUGF) spec requires python-urlgrabber
+- (BUGF) change settings default from 'ksdevice=eth0' to 'bootif'
+- (BUGF) keep DHCP restart quiet
+- (BUGF) better hostname setting with DHCP management on
+- (BUGF) fix bug in repo breed auto-detection code
+- (BUGF) close file descriptors by using subprocess, not os.system
+- (BUGF) make cobbler package Arch for now, require syslinux where it makes sense only.  To be changed in later release to download it from intertubes.
+
+- Mon Mar 30 2009 - 1.6.2
+- (BUGF) Fix for cache cleanup problem in cobblerd 
+
+- Fri Mar 27 2009 - 1.6.1
+- (FEAT) Improved anaconda monitoring code
+- (FEAT) download comps.xml always (even if yum does not have the option)
+- (FEAT) performance upgrades for cobblerd service to avoid reloads
+- (FEAT) more code for s390 imports (WIP)
+- (BUGF) import works better with rawhide
+- (FEAT) snippet to preserve SSH host keys across reinstalls
+- (FEAT) email trigger to notify when builds finish
+- (FEAT) triggers now are written in Python, old system still exists.
+- (FEAT) s390x zpxe support
+- (BUGF) retry power 5 times before giving up
+- (BUGF) fix for RHEL3 ppc imports
+- (FEAT) use nameserver variable in network config in Anaconda when set
+- (BUGF) sleep 5 seconds between power cycling systems
+- (FEAT) support for /usr/bin/cobbler-register
+- (FEAT) web UI search feature
+- (FEAT) very simple "cobbler hardlink" command to optimize space in /var/www/cobbler
+- (FEAT) new "change" trigger that runs on all adds/edits/removes/syncs
+- (FEAT) an SCM trigger that knows about /var/lib/cobbler kickstarts, snippets, and config directories, and audits them for changes
+- (BUGF) update ctime on object copies
+- (BUGF) fix cobbler check code that makes sure default password is not in use
+- (BUGF) remove duplicate text box for management classes from server edit page
+- (BUGF) fix stderr output on Ctrl+C
+- (BUGF) potential performance savings WRT duplicate python objects
+- (BUGF) don't deserialize during sync, it makes it take twice as long
+- (FEAT) Ubuntu support for import (added/improved)
+- (BUGF) make DHCP managemnet work with bonding
+- (BUGF) teach serializer_catalog to fly with JSON
+- (BUGF) don't use yumdownloader when rpm_list is []
+- (BUGF) fix default kickstart location
+- (BUGF) properly "flatten" environment values for webapp
+- (BUGF) fix for MSIE rendering in web app
+- (BUGF) stop yumdownloader including system yum repos
+- (DOCS) update webui project page link
+- (BUGF) remove caching logic from remote.py
+- (FEAT) added --exclude-dns option to buildiso
+- (BUGF) fix string comparisons to tolerate unicode
+- (BUGF) fix dealing with name servers and name servers search, esp in web app
+
+- Tue Mar 3 2009 - 1.4.3
+- (BUGF) fix OMAPI support's (note: deprecated) usage of subprocess
+- (BUGF) don't traceback on invalid cmd ("cobbler distro list --name=foo")
+- (BUGF) fix import usage with --kickstart option (no more traceback)
+- (BUGF) fix removal of images with child system objects
+- (BUGF) make --rpmlist on repo use same parsing routes as the rest of cobbler
+- (BUGF) default value for server override should be <<inherit>> not <inherit>
+- (BUGF) ensure if virt bridge is set to "" it will apply the value from settings
+- (BUGF) cobbler check should say path to config file is /etc/cobbler, not /var/lib
+- (FEAT) enable cobblerweb username/pass logins when authing with spacewalk
+- (BUGF) allow --kopts to take parameters that are shell quoted.
+- (BUGF) allow kernel options to start with '-'
+- (BUGF) Use shlex for parsing --kopts to allow a wider variety of kernel options
+- (BUGF) prevent potential traceback when --template-file data isn't a hash
+- (BUGF) anaconda doesn't honor nameserver always, set manually
+- (BUGF) various post install network snippet fixes
+- (BUGF) fix OMAPI support's (note: deprecated) usage of subprocess
+- (SPEC) fix build for rawhide now that yaboot is included
+- (BUGF) allow src and noarch arches for repo objects
+- (BUGF) move to PyYAML for YAML implementation since it is better maintained
+- (BUGF) fixed web-interface editing of ownership
+- (BUGF) fixed web-interface editing of management classes
+- (BUGF) don't run full sync in import, sync makes the install system unavailable for very short periods of time
+- (FEAT) XMLRPC functions for searching objects, just like the Python API has
+- (BUGF) make "find repo" CLI command search repos, not systems
+
+- XXX - 1.4.2
+- (BUGF) fix WTI power templates
+- (FEAT) add WTI power type
+- (BUGF) remove Python 2.6/3000 warnings
+- (BUGF) fix typo in network template (DNS enumeration)
+- (BUGF) make buildiso work for systems that are using bonding
+- (BUGF) blending fix for --template-files
+- (BUGF) cobbler check ignores comments in TFTP config
+- (BUGF) fix image type field editing in the webapp
+- (BUGF) allow deletion of eth0 if other interfaces are present
+- (BUGF) fix server-override setting in CLI for profile objects
+- (BUGF) systems and profiles are now sorted for "cobbler buildiso"
+- (BUGF) ensure that directories exist when installing a template file
+- (BUGF) fix for typo in network config snippet
+- (BUGF) fix for func integration script (should overwrite config, not append)
+- (BUGF) append nameservers and gateway, if set, for buildiso 
+
+- Fri Jan 09 2009 - 1.4.1
+- (BUGF) Cobbler check looks for right httpd on SUSE
+- (BUGF) post_install_network_config snippet had bash errors
+- (BUGF) don't run restorecon programatically
+- (FEAT) have cobbler check mention when semanage rules should be applied
+- (BUGF) fix an obscure xmlrpclib corner case where a string that looks like an int can't be served because xmlrpclib thinks it's an int.  Applies to XMLRPC consumers only, not CobblerWeb or the cobbler CLI.
+- (BUGF) fix external kickstart URLs (not templated) and per-system overrides.
+- (BUGF) fix 'cobbler check' code for SuSE services
+- (FEAT) batch editing on the system page.
+
+- Fri Dec 19 2008 - 1.4
+- (----) Stable release of 1.3 development branch
+
+- Fri Dec 19 2008 - 1.3
+- (FEAT) ACLs to extend authz (see Wiki)
+- (FEAT) puppet integration with --mgmt-classes and external nodes URL
+- (FEAT) added puppet external nodes script, cobbler-ext-nodes
+         see https://fedorahosted.org/cobbler/wiki/UsingCobblerWithConfigManagementSystem
+- (FEAT) ability to use --enable-menu=0/1 to hide profiles from the PXE menu, and config setting to change default value for --enable-menu
+- (FEAT) added livecd based physical machine cloner script to "contrib"
+- (FEAT) enable import for debian ISOs and mirrors (1 distro at a time for now)
+- (FEAT) auto-create rescue profile objects
+- (FEAT) included network_config snippet and added --static=0/1 to system objects
+- (FEAT) cobbler report gains additional options for Wiki formatting, csv, and showing only certain fields
+- (FEAT) changed default kernel options to include ksdevice=bootif (not ksdevice=eth0) and added ipappend 2 to PXE
+- (FEAT) distro edits now no longer require a sync to rebuild the PXE menu
+- (BUGF) minor tweak to the blender function to remove a certain class of typing errors where a string is being blended with a list, should not have any noticable effect on existing installs
+- (BUGF) add missing import of "_" in remote.py
+- (FEAT) upgraded webui editing for multiple NICs
+- (FEAT) "template_universe" variable created for snake's usage, variable contains all template variables and is also passed to the template.
+- (FEAT) refactored import with better Debian/Ubuntu support
+- (FEAT) Func integration snippets and new settings
+- (FEAT) settings file and modules.conf now generated by setup.py using templates
+- (FEAT) --template-files makes cobbler more of a full config management system!
+- (FEAT) cobbler reposync now supports --tries=N and --no-fail
+- (FEAT) duplicate hostname prevention, on by default
+- (FEAT) make import work for Scientific Linux
+- (FEAT) distro remove will remove mirrored content when it's safe to do so
+- (FEAT) repo remove will remove mirrored repo content
+- (FEAT) added snippet for better post-install network configuration
+- (BUGF) duplicate repo supression to prevent errors in certain Andaconda's
+- (FEAT) post_network_snippet/interfaces can set up VLANs
+- (FEAT) call unittests with nose, which offers cleaner output, see tests/README
+- (FEAT) update included elilo to 3.8
+- (BUGF) quote append line for elilo
+- (BUGF) added ExcludeArch: ppc64
+- (FEAT) --environment parameter added to reposync
+- (BUGF) have triggers ignore dotfiles so directories can be version controlled (and so on)
+- (FEAT) init scripts and specfiles now install on SuSE
+- (TEST) added remote tests, moved existing unit tests to api.py methods 
+- (FEAT) import can auto assign kickstarts based on distro (feature for beaker)
+- (FEAT) import now saves the dot version of the OS in the comment field
+- (FEAT) import now adds tree build time
+- (FEAT) --comment field added to all objects
+- (FEAT) keep creation and modification times with each object
+- (FEAT) added ppc imports and arches to supplement s390x (and assoc koan chage)
+- (FEAT) added number of interfaces required to each image
+- ~~~ 1.3.2
+- (BUGF) fix for possible import of insecure modules by Cheetah in Cobbler web.
+- (FEAT) new version function
+- (FEAT) misc WUI organization
+- (FEAT) allow auth against multiple LDAP servers
+- (FEAT) replicate now copies image objects
+- (BUGF) replicate now uses higher level API methods to avoid some profile sync errors when distros fail
+- (FEAT) /etc/cobbler/pxe and /etc/cobbler/power are new config file paths
+- (FEAT) /var/lib/cobbler/kickstarts is the new home for kicktart files
+- (FEAT) webui sidebar reorg
+- (FEAT) manage_dhcpd feature (ISC) now checks service status before restarting
+- (BUGF) omapi for manage_dhcp feature (ISC) now defaults to off
+- (FEAT) added module whitelist to settings file
+- (BUGF) don't let the service handler connect to itself over mod_python/proxy, RH 5.3 does not like
+- (FEAT) mtimes and ctimes and uids in the API
+- (FEAT) new functions to get objects based on last modified time, for sync with other apps
+- ~~~ 1.3.3 Test release
+- (FEAT) Python 2.6 specfile changes
+- ~~~ 1.3.X
+- (FEAT) cobbler check output is always logged to /var/log/cobbler/check.log
+- (FEAT) new redhat_register snippet and --redhat-management-key options!
+- (BUGF) SELinux optimizations to symlink/hardlink/chcon/restorecon behavior
+- (----) no SELinux support on EL 4
+- (FEAT) yum_post_install_mirror now on by default
+
+- ??? - 1.2.9
+- (BUGF) do not allow unsafe Cheetah imports
+
+- Wed Oct 15 2008 - 1.2.8
+- (BUGF) make cobbler read /etc/cobbler/settings.py (introduced in 1.2.6)
+
+- Tue Oct 14 2008 - 1.2.7
+- (BUGF) go easier on restrictings when importing subprofiles to prevent load errors
+- (FEAT) added debuginator script to scripts/ (not shipped with RPM)
+
+- Fri Oct 10 2008 - 1.2.6
+- (BUGF) fix image vs system parentage problem affecting cobbler replicate
+- (BUGF) fix restart-services trigger to not restart dns unneccessarily
+- (BUGF) add missing variable newname to signature for remote copy_ functions
+- (BUGF) fix for ownership ownership module when editing kickstarts
+
+- Fri Sep 26 2008 - 1.2.5
+- (BUGF) expose --arch for "cobbler image add"
+- (BUGF) unbreak dnsmasq DHCP management, similar to ISC bug
+- (BUGF) fix --arch for cobbler distro add/edit
+- (BUGF) fix merge error with remote.py's remove_profile function (fix webapp)
+- (BUGF) make keep_updated and mirror_locally checkboxes in WebUI display correctly
+
+- Mon Sep 08 2008 - 1.2.4
+- (BUGF) simple rebuild to remove cli_report.py, which is not in git
+
+- Sun Sep 07 2008 - 1.2.3
+- (BUGF) fix to manage_isc.py code
+
+- Fri Sep 05 2008 - 1.2.2
+- (BUGF) fix to where elilo location is loaded in manage_isc.py
+- (BUGF) populate netboot_enabled in WebUI correctly
+- (BUGF) make RPM own some unowned directories in "triggers"
+- (BUGF) add named_conf setting to settings
+
+- Tue Sep 02 2008 - 1.2.1
+- (BUGF) fix merge problem with 1.2 
+
+- Fri Aug 29 2008 - 1.2.0
+- (FEAT) All development work from 1.X merged in
+- (FEAT) when --netboot-enabled is toggled, rather than deleting the PXE config, create a local boot PXE config
+- (BUGF) disable some s390 aspects of cobbler check until it is supported
+- (FEAT) new --os-version, better validation for --breed, --breed/--os-version also for images
+
+- ??? - 1.1.1
+- (FEAT) make template replacement use regex module
+- (BUGF) remove bootloader check in settings as that code doesn't need it
+- (BUGF) refinements to image handling
+- (FEAT) getks command added to command line
+- (BUGF) don't print traceback during certain SystemExits
+- (BUGF) --help now works more intuitively on odd command line usage
+- (BUGF) use pxesystem for systems, not pxeprofile
+- (FEAT) make Cheetah formatting errors contain help text for users
+- (FEAT) --kopts-post can configure post-install kernel options
+- (BUGF) subtemplates are now errorCatcher Echo compatible
+
+- ??? - 1.1.0
+- devel branch
+- added cobbler aclsetup command for running cobbler as non-root
+- added cobbler find command to do searches from the command line
+- fix mkdir invocation
+- improved cobbler replicate, it now can rsync needed files
+- further templatize ISC dhcp config file (pay attention to /etc/cobbler/dhcp.template.rpmnew !)
+- fix for NFS imported URLs during kickstart generation
+- added yumreposync_flags to settings, default "-l" for use plugins
+- added an extra mkdir for rhn's reposync, though I believe the -l cures it already
+- allow mod python bits to work via non-80 http ports
+- when mirroring repos, act as 686 not 386 to get all the kernel updates
+- upgrades to cobbler buildiso
+- added patch to allow --in-place editing of ksmeta/kopts
+- added patch to allow multiple duplicate kernel options
+- fix kickstart serving when the tree is on NFS
+- s390x import, added support for s390x "pseudo-PXE" trees
+- added support for tracking image objects and virtual ISO images
+- support for multiple copies of the same kernel option in kopts
+- add cobbler bash completion script
+- fix bug with 255 kernel options line warning not firing soon enough
+- add findks.cgi support back as http://server/cblr/svc/op/findks
+- merge patch to surface status over API
+- make yum repos served up for /etc/yum.repos.d fully dynamic (mod_python)
+- cobbler find API calls and command line usage can now use fnmatch (wildcards)
+- return code cleanup (0/1 now more predictable)
+- added comments to /etc/cobbler/modules.conf
+- during import non-xen kernels will default --virt-type to qemu
+- when editing/adding profiles, auto-rebuild the PXE menu
+- added http://cobbler.example.org/cblr/svc/op/list/what/systems (or profiles, etc)
+- in the webui, only show compatible repos when editing a profile
+- refresh cobblerd cache before adding objects
+- system object IP's ok in CIDR notation (AAA.BBB.CCC.DDD/EE) for defining PXE behavior.
+- split partition select template into two parts (old one still ships)
+- cleanup some stock kickstarts so we always use $kickstart_start
+- hook ctrl+c during serializer writes to prevent possible corruption of data in /var/lib/cobbler
+- added 'serializer_catalog' as the new default serializer.  It is backward compatible and much faster.
+- removed serializer_shelve 
+- webui page lookups don't load the full object collection
+- systems can also inherit from images
+- changes to PXE images directly
+- bootloaders is no longer a config file setting
+- we can now look for syslinux in one of two places (/usr/lib, /usr/share)
+- cobbler hardlinks a bit more when it can for /var/www image copies
+- add Xen FV and VMware virt types to WebUI
+
+- Thu Jul 17 2008 - 1.0.4 (tentative)
+- Backported findks.cgi to mod_python, minor mod_python svc handler changes
+
+- Wed Jun 03 2008 - 1.0.3
+- Fix typo in replicate code
+- remove rhpl reference
+- scrub references to manage_*_mode and rewrite the restart-services trigger
+- add new settings to control whether the restart-trigger restarts things
+- yum reposync should also pull i686 kernels, not just i386
+- make cobblerd close file handles
+- fix kickstart serving when the tree is on NFS
+- fix missing reposync createdir (also now in stable branch)
+- add back missing remove_profile/remove_repo
+- remove profile_change support
+
+- Mon Jun 09 2008 - 1.0.2
+- Fix mkdir invocation
+- Fix error message output from failed kickstart rendering
+- manpage edits
+- make buildiso work for SuSE
+
+- Tue Jun 03 2008 - 1.0.1
+- Fix misformatted warning in "check"
+- Do not have RPM own tftpboot, just generate files in TFTP dir as detected
+- Default arches to 'i386' not 'x86' for consistency, esp. in import
+- When querying kickstart templates, do not return directories
+- Make triggers for add/delete work for renames and copies (same triggers)
+- Do not cache snippets so they can be tweaked w/o starting the service
+- Make manpage reference /etc/cobbler/settings, not /var/lib
+- Added manage_forward_zones/manage_reverse_zones to included config file
+- Fix python double-use-of-parameter error
+
+- Mon May 12 2008 - 0.9.2
+- run createrepo with less preconditions during cobbler reposync
+- doc upgrades and error handling for "cobbler replicate"
+- improved error message that occurs when copying from nfs w/ rootsquash
+- mac duplication checking improvements for CLI
+- add warning to cobbler check if selinux is on and Apache boolean not set
+- added warning to cobbler check if templates use the default password
+- setting per-system kickstart template to "" or "delete" restores inheritance
+- if repos in profiles no longer exist, remove noisy warning, move to "check"
+- move warning about reposync to check also (check is more useful at runtime now)
+- build pxe trees for systems even if interface0 is undefined
+- add sync() back into XMLRPC API, missing in 0.9.1
+- added 'distro_name', 'profile_name', and 'system_name' to generated template vars
+- it's now possible to undefine a --ksmeta or kopts symbol defined in a parent with "!foo"
+- log errors while rendering kickstarts
+- comments added to the config file, neat!
+- settings file is now /etc/cobbler/settings
+
+- Fri May 09 2008 - 0.9.1
+- patch to allow yumopts to override gpgcheck
+- applied patch to send hostname from ISC
+- added patch to allow --kopts/--ksmeta items to be cleared with --kopts=delete
+- tftpboot location is now inferred from xinetd config (added for F9 compat)
+- added authn_ldap and stub for authz_configfile
+- authz_configfile allows filtering ldap/other users by config file
+- WebUI now has checkbox on distro/profile for deleting child objects
+- cli has different semantics between "add" and "edit" now for safety reasons
+- cobbler wants to keep IPs/MACs unique now in configuration (can be disabled)
+- added --clobber option to allow add to overwrite existing objects (for scripts)
+- updated/tested kerberos support for those needing to auth against it 
+- update menu.c32 to 3.62 to allow for timeouts during menu (and future submenu)
+- update PXE defaults to invoke menu.c32 automatically w/ timeout
+- removed dependency on rhpl
+- import can now take an --arch (and is recommended usage)
+- now possible to override snippets on a profile/system specific basis
+- provide a different default sample kickstart for imports of F8 and later
+- support for kerberos authentication
+- revamped pre/post install triggers system (triggered via cgi from kickstart wget)
+- logrotate should not send emails to root when restarting services
+- default core (but not repo add) repos to priority 1 (lowest) if using priorities plugin
+- change default authentication to deny_all, xmlrpc_rw_enabled now on by default
+- additional fix for mod_python select box submissions
+- set repo arch if found in the URL and no --arch is specified
+- CGI scripts have been moved under mod_python for speed/consolidation
+- kickstart templates are now evaluated dynamically
+- optional MAC registration is now built-in to requesting kickstarts
+- legacy static file generation from /var/www/cobbler removed
+- implement "cobbler ___ dumpvars --name=X" feature to show template vars
+- validateks now works against all URLs as opposed to rendered local files
+- now possible to create new kickstarts in webui, and delete unused ones
+- support for OMAPI for avoid dhcp restarts
+- support for managing BIND
+- xen kernel (PV) distros do not get added to PXE menus as they won't boot there
+- cobbler buildiso command to build non live ISOs
+- cobbler replicate command
+- added cobbler repo option --mirror-locally to reference external repos without mirroring
+- all virt parameters on profiles can now be overriden on cobbler profile objects
+- added some additional links for kickstart viewing/editing to the web page
+
+- ??? - 0.8.3
+- Make createrepo get run for local cobbler reposync invocations as needed
+- fix WebUI documentation URL
+- fix bug in /etc/cobbler/modules.conf regarding pluggable authn/z
+- fix default flags for yumdownloader
+- fix for RHEL 4u6 DVD/tree import x86_64 arch detection
+- fix for dnsmasq template file host config path
+- fix dnsmasq template to point at the correct hosts file
+- force all names to be alphanumeric
+- all mod python pieces now happy with Unicode output
+
+* Fri Feb 22 2008 - 0.8.2
+- fix to webui to allow repos to be edited there on profile page
+- disable local socket XMLRPC as nothing is using it.
+- fixed findks.cgi so it supports multiple NICs
+- import now supports both --path and --mirror as aliases, as before
+- added change_profile.cgi for changing profiles from CGI
+- added register_mac.cgi
+
+* Wed Feb 20 2008 - 0.8.1
+- bugfix in reposync code
+- don't print tracebacks on SystemExit from optparse
+- manpage tweaks
+
+* Fri Feb 15 2008 - 0.8.0 (TBD)
+- stable release of 0.7.* branch plus ...
+- fixed potential user problem with source_repos in upgrade scenario
+- additional higher level API functions for find, fixes for other higher level API functions
+- better messaging when insufficient permissions on needed files
+- update permissions on reposync fixes
+
+* Thu Jan 31 2008 - 0.7.2 (0.8 rc)
+- default_virt_file_size and default_virt_ram added to settings
+- enforce permissions/selinux context after reposync
+- better API for copying/renames, API consistancy cleanup
+- support for renames that resolve dependencies, inclusion in CLI+webapp
+- remove leading newline in rendered template files, which apparently breaks AutoYAST?
+- recursive syncs automatically sync all subobjects when editing parent objects (default behavior)
+- deletes can now be done recursively (optional --recursive on distro/profile remove)
+- 'cobbler list' is now (re)sorted
+
+* Wed Jan 09 2008 - 0.7.1
+- allow imports to force usage of a specific kickstart template with --kickstart
+- added --yumopts parameter to repos (works just like --kopts/--ksmeta)
+- minor doc fixes
+- fix for name of F8 comps.xml file
+- added option --rsync-flags to import command
+- added http_port to settings to run Apache on non-80
+- rsync during createrepo now keeps filesystem permissions/groups
+- ...
+
+* Mon Dec 10 2007 - 0.7.0
+- Testing branch
+- Fix bug related to <<inherit>> and kickstart args 
+- Make CLI functions modular and use optparse
+- Quote wget args to avoid creating stray files on target system
+- Support Xen FV as virt type (requires F8+)
+- Implemented fully pluggable authn/authz system
+- WebUI is now mod_python based
+- Greatly enhanced logging (goes to /var/log/cobbler/cobbler.log)
+- ...
+
+* Wed Nov 14 2007 - 0.6.4
+- Changed permissions of auth.conf
+- Fixes for working with rhn_yum_plugin
+- still allow repo configuration for distro repos that have just 1 repo (like C5.1)
+- disable CGI weblogging by default (backend logging TBA)
+- fix WebUI handling of keep_updated (repo field) and netboot_enabled (system field)
+- disable the blender_cache as it's running afoul of the sync code
+- update htaccess file to only authenticate the webui, not nopxe.cgi and findks.cgi
+
+* Wed Nov 07 2007 - 0.6.3
+- Be able to define and use Multiple NICs per system
+- Add --virt-cpus to profile editing
+- Fix bug where WUI (XMLRPC) auth wasn't supported on EL4
+- Add --virt-bridge to profile editing and NICs
+- Added serializer_shelve (as option) for added performance/persistance over YAML, experimental in /etc/cobbler/modules.conf, see Wiki
+- Backup state files and migrate state structures upon RPM upgrade
+- Added some more redundant files (for unsupported distros) to the rsync.exclude file
+- added pre-sync and post-sync triggers, service restarts are now handled by /var/lib/cobbler/triggers
+- webui now uses htaccess (see manpage and Wiki for setup instructions)
+- added pagination to the WUI to keep pages from growing overly long
+- added --server-override parameter for help with multi-subnet configurations (also see Wiki)
+- removed yum-utils as a hard requirement, cobbler check now looks for yum-utils
+- fixed bug where cobbler would try to copy hardlinks to themselves during sync
+- misc random bugfixing
+
+* Fri Sep 28 2007 - 0.6.2
+- cobbler repo auto-add to discover yum repos automatically
+- fix bug that allows empty mac addresses (None) in dhcpd.conf
+- kickstarts automatically save kickstart file used to /root/cobbler.ks
+- allow multiple (comma-seperated) values for --virt-size
+- removed deprecated 'enchant' function (use SSH and koan instead)
+- cleanup of a few unused settings
+- allow for serialization modules to be selected in /etc/cobbler/modules.conf
+- patch to allow for reposync of specific repos, even if not set to update
+- added --dhcp-tag section for better DHCP customization (esp with multiple subnets)
+- added Apache proxying around XMLRPC port for wider network access
+- refactor XMLRPC API and establish a read-write API
+- allow for configuring of read-write XMLRPC users in /etc/cobbler/auth.conf
+- WebUI
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires to help build on other platforms
+- relocate cgi-bin files to cgi-bin/cobbler for namespacing
+- fix syslog logging for systems not in the cobbler DB.
+- fix bug in which non-lowercase intermediate objects could be deleted 
+ 
+* Thu Aug 30 2007 - 0.6.1
+- re enable --resolve in yumdownloader (cobbler repo mgmt feature)
+- fix get_distros_for_koan API function in cobblerd (not used by koan)
+- allow find API to search by arbitrary fields
+- status and logging now shows system names
+- upgraded init scripts
+- zeroconf/avahi publishing for cobblerd service
+- logRequests = 0 for XMLRPC.  Make it be quiet.
+- ignore subdirectories of /var/lib/cobbler/snippets
+- fixed bug in graph rendering that allowed for upward property propogation in some cases
+- fixed bug that did not correctly evaluate repository settings of inherited sub-profiles/objects
+- tweaked domU sample kickstart to include wget
+- added some more unit tests
+- fix typo down one error path in cobbler sync.
+- fix reposync handling when using rsync protocol and directory paths do not contain arch
+- allow basic usage of Cheetah variables in config files @@server@@, etc.
+- fix auto-repo attachment for distros with split trees (i.e. RHEL5)
+
+* Thu Aug 09 2007 - 0.6.0 
+- bugfix in error path in "cobbler check"
+- stable release for 0.5.x
+
+* Thu Jul 26 2007 - 0.5.2 (RC)
+- Have cobbler check ensure services are started
+- Add cobbler validateks command to look for broken rendered kickstarts
+- Added -v/--version
+- Added SNIPPET::foo capability to pull /var/lib/cobbler/snippets/foo into templates (anywhere)
+- Import can now take an --available-as=nfs://server:/mount/point to do cobbler import without mirroring
+- Feature to enable "pxe_just_once" for boot loop prevention
+
+* Fri Jul 20 2007 - 0.5.1
+- Added logging for cobblerd -- /var/log/cobbler/cobblerd.log
+- Cobblerd now ignores XMLRPC IOError
+- Added findks.cgi
+- Misc bugfixing
+- Added --virt-path, --virt-type
+
+* Wed Jun 24 2007 - 0.5.0
+- Remove hardcode of /var/www/cobbler in cobblerd
+- Improve various warning warning messages
+- cobbler (objecttype) (objectname) now gives info about the object instead of just all objects
+- Added --hostname to "cobbler system add", --ip-address (or --ip) is also a better alias for the misnamed --pxe-address
+- Optionally use dnsmasq for DHCP (and DNS!) instead of ISC dhcpd.
+- Add --mac and remove requirement for --name to be an ip, mac, or hostname.
+- Manpage cleanup
+- Patch to allow pre and post triggers
+- Patch to allow --createrepo-flags and to cache on import, fix multiple calls to createrepo
+- Various modifications to allow for profile inheritance
+- All variables in object tree now available for use in templating, nicer blending algorithms
+- Optional override of --kickstart in system object
+
+* Thu Apr 26 2007 - 0.4.8
+- Make import friendlier for older distros
+- Make import friendlier for newer createrepos that don't have --basedir
+
+* Fri Apr 20 2007 - 0.4.7
+- Disable mod_python tracker piece for RHEL5 (replacement eventual).
+- Kickstart tracking now understands Apache logs
+- Added support for --rpm-list parameter to "repo add" for download of partial content from repositories
+  (ex: cobbler and koan from FC6extras, w/o games).
+- More consistant naming on imports, regardless of data source.
+- Teach cobbler to remove .olddata dirs, which can happen if createrepo crashes or is killed mid-process
+- Default yum_core_repos_from_server to 0 
+- Implemented triggers for add/delete commands
+- BootAPI and Config object classes are now Borg patterned to prevent duplication of config info from the API.
+- cobbler_syslogd -> cobblerd, now has XMLRPC component for koan >= 0.2.9 clients.  Old clients still work.
+- Make cobbler_import work for Centos 5
+- Removed requirements on what files that are parameters to --kernel and --initrd must be named.
+- Added support for "rename", "copy", and "edit" commands -- before there just was "add" and "remove"
+
+* Thu Apr 05 2007 - 0.4.6
+- Bind cobbler_syslogd to all addresses
+- Store repos as list, not string
+- Fix traceback in cobbler_sync with older configurations (pre-kickstart tracking)
+- Make cobbler import feature better understand older RHEL and in-between builds of Fedora.
+- Make cobbler repo add/reposync understand http://, ftp://, and some limited support for RHN.
+- Add settings parameter to toggle core repo mirror behavior on/off.
+- Manpage cleanup.
+
+* Fri Mar 23 2007 - 0.4.5
+- Removed legacy --virt-name parameter, requires koan upgrade to 0.2.8
+
+* Fri Mar 23 2007 - 0.4.4
+- Generate PXE configuration files from templates in /etc/cobbler to be more customizable
+- Fix bug with wrong kickstart metadata being used for import
+- Fix bug with argument parsing for --repos
+- Much cleaner distro/profile names with --import
+- For import, the "tree" parameter is now attached to the distro, not the profile
+- Add "links" directory in webdir for symlinking to full kickstart tree paths.
+- Misc tweaks to shorten kernel parameter length
+- Giving invalid arguments to "report" will show an error message
+- Distros, Profiles, and System names are now case insensitive.
+
+* Wed Feb 28 2007 - 0.4.3
+- Added netboot_enabled option for systems to control install loops in programmatic context.
+- Disabling anchors in YAML serialization (which make files harder to edit)
+- Fix bug in ksmeta argument processing, takes whitespace again, not commas
+- Fix bug in old-style deserialization with str and int concatenation
+
+* Mon Feb 19 2007 - 0.4.2
+- Fix bug in "cobbler system remove"
+
+* Mon Feb 19 2007 - 0.4.1
+- Bundle menu.c32 for older distros
+- Unbundle Cheetah as it's available at http://www.python.org/pyvault/centos-4-i386/
+
+* Mon Feb 19 2007 - 0.4.0
+- Added feature to minimize the need to run "cobbler sync" for add commands
+  Now only need to run sync when files change behind the scenes or when
+  manually editing YAML
+- Moving back to Cheetah for templating (old kickstarts should escape $ with \$)
+- 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
+
+* Thu Jan 24 2007 - 0.3.8
+- Fixed minor bug in logfile processing related to 0.3.7
+
+* Thu Jan 24 2007 - 0.3.7
+- Default/examples kickstarts are now fully automatic (added hd type/size detection).
+- Kickstart tracking now includes remote syslog support, just run "cobbler sync" to enable.
+- "cobbler status" command improved to include syslog info/times.
+- Added fc6 kickstart file that was left out of the RPM earlier
+- Added mini domU kickstart
+- bugfix: don't install mod_python watcher on older Apache installs (like RHEL4) as it
+  somehow corrupts downloads on older copies.  kickstart tracking by syslog still works
+  on those platforms.  (This only applies to the cobbler server, not clients).
+
+* Thu Dec 21 2006 - 0.3.6
+- locking feature now enabled
+- "enchant" now supports provisioning virtual images remotely when using --is-virt=yes
+- cobbler no longer restarts httpd if the config file already exists.
+- "cobbler repo sync" is now an alias for "cobbler reposync"
+- "cobbler list --something" can now be invoked as "cobbler something list"
+- "cobbler list" just shows names of items now
+- "cobbler report" is now used for showing full information output
+- "list" (as well as report) are now sorted alphabetically
+- basic kickstart tracking feature. requests on /var/www/cobbler get logged to /var/log/cobbler.
+
+* Wed Dec 20 2006 - 0.3.5
+- Fixed bug in cobbler import related to orphan detection
+- Made default rsync.exclude more strict (OO langpacks and KDE translation)
+- Now runs createrepo during "cobbler import" to build more correct repodata
+- Added additional repo mirroring commands:  "cobbler repo add", etc
+- Documentation on repo mirroring features.
+- fix bug in rsync:// import code that saved distributions in the wrong path
+- The --dryrun option on "cobbler sync" is now unsupported.
+- Fixed bug in virt specific profile information not being used with koan
+- import now takes --name in addition to --mirror-name to be more consistant
+- rsync repo import shouldn't assume SSH unless no rsync:// in mirror URL
+- strict host key checking disabled for "cobbler enchant" feature
+
+* Mon Dec 05 2006 - 0.3.4
+- Don't rsync PPC content or ISO's on cobbler import
+- Manpage cleanup
+
+* Tue Nov 14 2006 - 0.3.3
+- During "cobbler sync" only PXE-related directories in /tftpboot
+  are deleted.  This allows /tftpboot to be used for other
+  purposes.
+
+* Thr Oct 25 2006 - 0.3.2
+- By default, boot and install in text mode
+
+* Wed Oct 25 2006 - 0.3.1
+- The app now refers to "virt" in many places instead of "xen".
+  It's been coded such that files will migrate forward without
+  any major issues, and the newer version of koan can still hit
+  older releases (for now).  The CLI still takes the --xen options
+  as well as the new --virt options, as they are aliased.  The API
+  now exclusively just uses methods with "virt" in them, however.
+- ...
+
+* Tue Oct 24 2006 - 0.3.0
+- Reload httpd during sync
+- New profiles without set kickstarts default to /etc/cobbler/default.ks
+  though this can be changed in /var/lib/cobbler/settings
+- Better forward upgrades for /var/lib/cobbler/settings.  New entries
+  get added when they are referenced.
+
+* Tue Oct 24 2006 - 0.2.9
+- Bug fix, enchant now detects if koan_path is not set
+- import now can do ssh rsync as well as just rsyncd
+- Misc bug fixes related to not choking on bad info
+- Fixed bug where --pxe-address wasn't surfaced
+- Sync is a little less verbose
+
+* Wed Oct 18 2006 - 0.2.8
+- Performance speedups to "import" command
+- Bug fix, imported paths (again) convert slashes to underscores
+
+* Tue Oct 17 2006 - 0.2.7
+- Removed pexpect to enhance support for other distros
+- enchant syntax changed (see NEWS)
+- now builds on RHEL4
+
+* Tue Oct 17 2006 - 0.2.6
+- Removing Cheetah and replacing w/ simpler templating system
+- Don't delete localmirror on sync
+
+* Mon Oct 16 2006 - 0.2.5
+- New "import" feature for rsync:// mirrors and filesystem directories
+- Manpage clarification
+- "enchant" is now a subcommand of "cobbler system" and takes less arguments.
+- Several random bugfixes (mainly along error paths)
+
+* Wed Oct 11 2006 - 0.2.4
+- Changes to make things work with python 2.3 (RHEL4, etc)
+- Updated YAML code to ensure better backward compatibility
+
+* Mon Oct 9 2006 - 0.2.3
+- Cobbler now creates a profile and system listing (YAML) in /var needed
+  by the next version of koan (which will be 0.2.1)
+- bugfix: enchant should reboot the target box
+- bugfix: enchant should fail if path to koan isn't configured
+
+* Fri Oct 6 2006 - 0.2.2
+- bugfix: "--pxe-hostname" made available in CLI and renamed as "--pxe-address"
+- workaround: elilo doesn't do MAC address pxe config files, use IP for ia64
+- bugfix: added next-server line for per-MAC dhcp configs
+- bugfix: fixed manpage errors
+
+* Thu Sep 28 2006 - 0.2.1
+- New ability to "enchant" remote systems (see NEWS)
+- Misc. bugfixes
+
+* Fri Sep 22 2006 - 0.2.0
+- New dhcp.d conf management features (see NEWS)
+- IA64 support (see NEWS)
+- dhcpd.conf MAC & hostname association features
+
+* Thu Sep 21 2006 - 0.1.1-8
+- (RPM) Added doc files to doc section, removed INSTALLED_FILES
+
+* Wed Sep 20 2006 - 0.1.1-7
+- Split HTTP and TFTP content to seperate directories
+  to enable running in SELinux targetted/enforcing mode.
+- Make the Virt MAC address a property of a system, not a profile
+- Misc. fixes, mainly along the error path
+
+* Fri Sep 15 2006 - 0.1.1-6
+- Make koan own it's directory, add GPL "COPYING" file.
+
+* Wed Aug 16 2006 - 0.1.1-5
+- Spec file tweaks only for FC-Extras
+
+* Thu Jul 20 2006 - 0.1.1-4
+- Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module.
+
+* Wed Jul 12 2006 - 0.1.1-3
+- Added templating support using Cheetah
+
+* Thu Jul 9 2006 - 0.1.0-2
+- Fedora-Extras rpm spec tweaks
+
+* Tue Jun 28 2006 - 0.1.0-1
+- rpm genesis
+
+
 
=== renamed file 'CHANGELOG' => 'CHANGELOG.moved'
=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2011-03-11 21:10:49 +0000
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
 
=== renamed file 'COPYING' => 'COPYING.moved'
=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2011-03-11 21:10:49 +0000
@@ -0,0 +1,13 @@
+include COPYING AUTHORS README CHANGELOG
+include cobbler.spec
+
+recursive-include aux *
+recursive-include config *
+recursive-include docs *
+recursive-include installer_templates *
+recursive-include kickstarts *
+recursive-include snippets *
+recursive-include scripts *
+recursive-include templates *
+recursive-include web *
+
 
=== renamed file 'MANIFEST.in' => 'MANIFEST.in.moved'
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2011-03-11 21:10:49 +0000
@@ -0,0 +1,9 @@
+Cobbler README
+
+Docs are currently available two ways:
+- Install the RPM and run "man cobbler"
+- Run "perldoc cobbler.pod" from a source checkout
+
+To build the RPM:
+- Run "make"
+
 
=== renamed file 'README' => 'README.moved'
=== added directory 'aux'
=== renamed directory 'aux' => 'aux.moved'
=== added file 'aux/anamon'
--- aux/anamon	1970-01-01 00:00:00 +0000
+++ aux/anamon	2011-03-11 21:10:49 +0000
@@ -0,0 +1,280 @@
+#!/usr/bin/python
+
+"""
+This is a script used to automatically log details from an Anaconda
+install back to a cobbler server.
+
+Copyright 2008, Red Hat, Inc
[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 sys
+import string
+import time
+import re
+import base64
+import shlex
+
+# on older installers (EL 2) we might not have xmlrpclib
+# and can't do logging, however this is more widely
+# supported than remote syslog and also provides more
+# detail.
+try:
+    import xmlrpclib
+except ImportError, e:
+    print "xmlrpclib not available, exiting"
+    sys.exit(0)
+
+# shlex.split support arrived in python-2.3, the following will provide some
+# accomodation for older distros (e.g. RHEL3)
+if not hasattr(shlex, "split"):
+    shlex.split = lambda s: s.split(" ")
+
+class WatchedFile:
+    def __init__(self, fn, alias):
+        self.fn = fn
+        self.alias = alias
+        self.reset()
+
+    def reset(self):
+        self.where = 0
+        self.last_size = 0
+        self.lfrag=''
+        self.re_list={}
+        self.seen_line={}
+
+    def exists(self):
+        return os.access(self.fn, os.F_OK)
+
+    def lookfor(self,pattern):
+        self.re_list[pattern] = re.compile(pattern,re.MULTILINE)
+        self.seen_line[pattern] = 0
+
+    def seen(self,pattern):
+        if self.seen_line.has_key(pattern):
+            return self.seen_line[pattern]
+        else:
+            return 0
+
+    def changed(self):
+        if not self.exists():
+            return 0
+        size = os.stat(self.fn)[6]
+        if size > self.last_size:
+            self.last_size = size
+            return 1
+        else:
+            return 0
+
+    def uploadWrapper(self, blocksize = 262144):
+        """upload a file in chunks using the uploadFile call"""
+        retries = 3
+        fo = file(self.fn, "r")
+        totalsize = os.path.getsize(self.fn)
+        ofs = 0
+        while True:
+            lap = time.time()
+            contents = fo.read(blocksize)
+            size = len(contents)
+            data = base64.encodestring(contents)
+            if size == 0:
+                offset = -1
+                sz = ofs
+            else:
+                offset = ofs
+                sz = size
+            del contents
+            tries = 0
+            while tries <= retries:
+                debug("upload_log_data('%s', '%s', %s, %s, ...)\n" % (name, self.alias, sz, offset))
+                if session.upload_log_data(name, self.alias, sz, offset, data):
+                    break
+                else:
+                    tries = tries + 1
+            if size == 0:
+                break
+            ofs += size
+        fo.close()
+
+    def update(self):
+        if not self.exists():
+            return
+        if not self.changed():
+            return
+        try:
+            self.uploadWrapper()
+        except:
+            raise
+
+class MountWatcher:
+
+    def __init__(self,mp):
+        self.mountpoint = mp
+        self.zero()
+
+    def zero(self):
+        self.line=''
+        self.time = time.time()
+
+    def update(self):
+        found = 0
+        if os.path.exists('/proc/mounts'):
+            fd = open('/proc/mounts')
+            while 1:
+                line = fd.readline()
+                if not line:
+                    break
+                parts = string.split(line)
+                mp = parts[1]
+                if mp == self.mountpoint:
+                    found = 1
+                    if line != self.line:
+                        self.line = line
+                        self.time = time.time()
+            fd.close()
+        if not found:
+            self.zero()
+
+    def stable(self):
+        self.update()
+        if self.line and (time.time() - self.time > 60):
+            return 1
+        else:
+            return 0
+
+def anamon_loop():
+    alog = WatchedFile("/tmp/anaconda.log", "anaconda.log")
+    alog.lookfor("step installpackages$")
+
+    slog = WatchedFile("/tmp/syslog", "sys.log")
+    xlog = WatchedFile("/tmp/X.log", "X.log")
+    llog = WatchedFile("/tmp/lvmout", "lvmout.log")
+    storage_log = WatchedFile("/tmp/storage.log", "storage.log")
+    prgm_log = WatchedFile("/tmp/program.log", "program.log")
+    vnc_log = WatchedFile("/tmp/vncserver.log", "vncserver.log")
+    kcfg = WatchedFile("/tmp/ks.cfg", "ks.cfg")
+    scrlog = WatchedFile("/tmp/ks-script.log", "ks-script.log")
+    dump = WatchedFile("/tmp/anacdump.txt", "anacdump.txt")
+    mod = WatchedFile("/tmp/modprobe.conf", "modprobe.conf")
+
+    # Setup '/mnt/sysimage' watcher
+    sysimage = MountWatcher("/mnt/sysimage")
+
+    # Monitor for {install,upgrade}.log changes
+    package_logs = list()
+    package_logs.append(WatchedFile("/mnt/sysimage/root/install.log", "install.log"))
+    package_logs.append(WatchedFile("/mnt/sysimage/tmp/install.log", "tmp+install.log"))
+    package_logs.append(WatchedFile("/mnt/sysimage/root/upgrade.log", "upgrade.log"))
+    package_logs.append(WatchedFile("/mnt/sysimage/tmp/upgrade.log", "tmp+upgrade.log"))
+
+    # Monitor for bootloader configuration changes
+    bootloader_cfgs = list()
+    bootloader_cfgs.append(WatchedFile("/mnt/sysimage/boot/grub/grub.conf", "grub.conf"))
+    bootloader_cfgs.append(WatchedFile("/mnt/sysimage/boot/etc/yaboot.conf", "yaboot.conf"))
+    bootloader_cfgs.append(WatchedFile("/mnt/sysimage/boot/efi/efi/redhat/elilo.conf", "elilo.conf"))
+    bootloader_cfgs.append(WatchedFile("/mnt/sysimage/etc/zipl.conf", "zipl.conf"))
+
+    # Were we asked to watch specific files?
+    watchlist = list()
+    waitlist = list()
+    if watchfiles:
+        # Create WatchedFile objects for each requested file
+        for watchfile in watchfiles:
+            if os.path.exists(watchfile):
+                watchfilebase = os.path.basename(watchfile)
+                watchlog = WatchedFile(watchfile, watchfilebase)
+                watchlist.append(watchlog)
+
+    # Use the default watchlist and waitlist
+    else:
+        watchlist = [alog, slog, dump, scrlog, mod, llog, kcfg, storage_log, prgm_log, vnc_log, xlog]
+        waitlist.extend(package_logs)
+        waitlist.extend(bootloader_cfgs)
+
+    # Monitor loop
+    while 1:
+        time.sleep(5)
+
+        # Not all log files are available at the start, we'll loop through the
+        # waitlist to determine when each file can be added to the watchlist
+        for watch in waitlist:
+            if alog.seen("step installpackages$") or (sysimage.stable() and watch.exists()):
+                debug("Adding %s to watch list\n" % watch.alias)
+                watchlist.append(watch)
+                waitlist.remove(watch)
+
+        # Send any updates
+        for wf in watchlist:
+            wf.update()
+
+        # If asked to run_once, exit now
+        if exit:
+            break
+
+# Establish some defaults
+name = ""
+server = ""
+port = "80"
+daemon = 1
+debug = lambda x,**y: None
+watchfiles = []
+exit = False
+
+# Process command-line args
+n = 0
+while n < len(sys.argv):
+    arg = sys.argv[n]
+    if arg == '--name':
+        n = n+1
+        name = sys.argv[n]
+    elif arg == '--watchfile':
+        n = n+1
+        watchfiles.extend(shlex.split(sys.argv[n]))
+    elif arg == '--exit':
+        exit = True
+    elif arg == '--server':
+        n = n+1
+        server = sys.argv[n]
+    elif arg == '--port':
+        n = n+1
+        port = sys.argv[n]
+    elif arg == '--debug':
+        debug = lambda x,**y: sys.stderr.write(x % y)
+    elif arg == '--fg':
+        daemon = 0
+    n = n+1
+
+# Create an xmlrpc session handle
+session = xmlrpclib.Server("http://%s:%s/cobbler_api" % (server, port))
+
+# Fork and loop
+if daemon:
+    if not os.fork():
+        # Redirect the standard I/O file descriptors to the specified file.
+        DEVNULL = getattr(os, "devnull", "/dev/null")
+        os.open(DEVNULL, os.O_RDWR) # standard input (0)
+        os.dup2(0, 1)               # Duplicate standard input to standard output (1)
+        os.dup2(0, 2)               # Duplicate standard input to standard error (2)
+
+        anamon_loop()
+        sys.exit(1)
+    sys.exit(0)
+else:
+    anamon_loop()
+
 
=== added file 'aux/anamon.init'
--- aux/anamon.init	1970-01-01 00:00:00 +0000
+++ aux/anamon.init	2011-03-11 21:10:49 +0000
@@ -0,0 +1,101 @@
+#!/bin/bash
+## BEGIN INIT INFO
+# Provides: anamon
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 4 6
+# Required-Start:
+# Should-Start: $network
+# Short-Description: Starts the cobbler anamon boot notification program
+# Description: anamon runs the first time a machine is booted after
+#              installation.
+## END INIT INFO
+
+#
+# anamon: Starts the cobbler post-install boot notification program
+#
+# chkconfig: 35 99 95
+#
+# description: anamon runs the first time a machine is booted after
+#              installation.
+#
+
+LOCKFILE="/var/lock/subsys/anamon"
+CFGFILE="/etc/sysconfig/anamon"
+
+# Source function library.
+. /etc/init.d/functions
+
+# Source anamon config
+. $CFGFILE
+
+LOGFILES=${LOGFILES:-/var/log/boot.log}
+
+# FIXME - can we rely on the koan snippet to update /etc/profile.d/cobbler.sh?
+if [ -z "$COBBLER_SERVER" ]; then
+    echo "No COBBLER_SERVER defined in $CFGFILE"
+    exit 1
+fi
+
+if [ -z "$COBBLER_NAME" ]; then
+    echo "No COBBLER_NAME defined in $CFGFILE"
+    exit 1
+fi
+
+if [ -z "$LOGFILES" ]; then
+    echo "No LOGFILES defined in $CFGFILE"
+    exit 1
+fi
+
+start() {
+    echo -n $"Starting anamon: "
+    daemon /usr/local/sbin/anamon --watchfile \"$LOGFILES\" --name $COBBLER_NAME --server $COBBLER_SERVER --port ${COBBLER_PORT:-80} --exit
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && touch $LOCKFILE
+    echo
+
+    # Disable service start
+    chkconfig anamon off
+
+    return $RETVAL
+}
+
+stop () {
+    echo -n $"Shutting down anamon: "
+    killproc /usr/local/sbin/anamon
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
+    echo
+    return $RETVAL
+}
+
+restart() {
+    stop
+    start
+}
+
+case "$1" in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    restart)
+        restart
+        ;;
+    condrestart)
+        if [ -f $LOCKFILE ]; then
+            restart
+        fi
+        ;;
+    status)
+        status anamon
+        RETVAL=$?
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+        RETVAL=2
+        ;;
+esac
+
+exit $RETVAL
 
=== added directory 'cobbler'
=== renamed directory 'cobbler' => 'cobbler.moved'
=== added file 'cobbler.spec'
--- cobbler.spec	1970-01-01 00:00:00 +0000
+++ cobbler.spec	2011-03-11 21:10:49 +0000
@@ -0,0 +1,266 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+
+%define _binaries_in_noarch_packages_terminate_build 0
+%global debug_package %{nil}
+Summary: Boot server configurator
+Name: cobbler
+License: GPLv2+
+AutoReq: no
+Version: 2.1.0
+Release: 2%{?dist}
+Source0: http://shenson.fedorapeople.org/cobbler/cobbler-%{version}.tar.gz
+Group: Applications/System
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler
+
+BuildRequires: redhat-rpm-config
+BuildRequires: PyYAML
+BuildRequires: python-cheetah
+
+Requires: python >= 2.3
+Requires: httpd
+Requires: tftp-server
+Requires: mod_wsgi
+Requires: createrepo
+Requires: python-cheetah
+Requires: python-netaddr
+Requires: python-simplejson
+Requires: python-urlgrabber
+Requires: PyYAML
+Requires: rsync
+
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: python(abi) >= %{pyver}
+Requires: genisoimage
+%else
+Requires: mkisofs
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+Requires: yum-utils
+%endif
+
+Requires(post):  /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+
+%description
+
+Cobbler is a network install server.  Cobbler supports PXE,
+virtualized installs, and re-installing existing Linux machines.  The
+last two modes use a helper tool, 'koan', that integrates with
+cobbler.  There is also a web interface 'cobbler-web'.  Cobbler's
+advanced features include importing distributions from DVDs and rsync
+mirrors, kickstart templating, integrated yum mirroring, and built-in
+DHCP/DNS Management.  Cobbler has a XMLRPC API for integration with
+other applications.
+
+%prep
+%setup -q
+
+%build
+%{__python} setup.py build
+
+%install
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
+mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
+install -p -m 644 config/cobbler.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/
+install -p -m 644 config/cobbler_web.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/
+
+mkdir -p $RPM_BUILD_ROOT/var/spool/koan
+
+%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
+mkdir -p $RPM_BUILD_ROOT/var/lib/tftpboot/images
+%else
+mkdir -p $RPM_BUILD_ROOT/tftpboot/images
+%endif
+
+rm -f $RPM_BUILD_ROOT/etc/cobbler/cobblerd
+
+%clean
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+
+%post
+if [ "$1" = "1" ];
+then
+    # This happens upon initial install. Upgrades will follow the next else
+    /sbin/chkconfig --add cobblerd
+elif [ "$1" -ge "2" ];
+then
+    # backup config
+    if [ -e /var/lib/cobbler/distros ]; then
+        cp /var/lib/cobbler/distros*     /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/profiles*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/systems*     /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/repos*       /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/networks*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/mgmtclasses* /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/packages*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/files*       /var/lib/cobbler/backup 2>/dev/null
+    fi
+    if [ -e /var/lib/cobbler/config ]; then
+        cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+    fi
+    # upgrade older installs
+    # move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
+    for n in power pxe; do
+      rm -f /etc/cobbler/$n*.rpmnew
+      find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
+        newf=/etc/cobbler/$n/`basename $f`
+        [ -e $newf ] &&  mv $newf $newf.rpmnew
+        mv $f $newf
+      done
+    done
+    # upgrade older installs
+    # copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
+    rm -f /etc/cobbler/*.ks.rpmnew
+    find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
+      newf=/var/lib/cobbler/kickstarts/`basename $f`
+      [ -e $newf ] &&  mv $newf $newf.rpmnew
+      cp $f $newf
+    done
+    /sbin/service cobblerd condrestart
+fi
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/service cobblerd stop >/dev/null 2>&1 || :
+    chkconfig --del cobblerd || :
+fi
+
+%postun
+if [ "$1" -ge "1" ]; then
+    /sbin/service cobblerd condrestart >/dev/null 2>&1 || :
+    /sbin/service httpd condrestart >/dev/null 2>&1 || :
+fi
+
+
+%files
+
+%defattr(-,root,root,-)
+
+%{_bindir}/cobbler
+%{_bindir}/cobbler-ext-nodes
+%{_bindir}/cobblerd
+%{_sbindir}/tftpd.py*
+
+%config(noreplace) %{_sysconfdir}/cobbler
+/etc/init.d/cobblerd
+
+%{python_sitelib}/cobbler
+
+%config(noreplace) /var/lib/cobbler
+
+/var/log/cobbler
+/var/www/cobbler
+
+%{_mandir}/man1/cobbler.1.gz
+
+%config(noreplace) /etc/httpd/conf.d/cobbler.conf
+
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/cobbler/sub_process.py*
+%endif
+%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
+%{python_sitelib}/cobbler*.egg-info
+/var/lib/tftpboot/images
+%else
+/tftpboot/images
+%endif
+
+%doc AUTHORS CHANGELOG README COPYING
+
+%package -n koan
+
+Summary: Helper tool that performs cobbler orders on remote machines
+Group: Applications/System
+Requires: python >= 2.0
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: python(abi) >= %{pyver}
+%endif
+
+
+%description -n koan
+
+Koan stands for kickstart-over-a-network and allows for both
+network installation of new virtualized guests and reinstallation
+of an existing system.  For use with a boot-server configured with Cobbler
+
+%files -n koan
+%defattr(-,root,root,-)
+%dir /var/spool/koan
+%dir /var/lib/koan/config
+%{_bindir}/koan
+%{_bindir}/cobbler-register
+%{python_sitelib}/koan
+
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/koan/sub_process.py*
+%exclude %{python_sitelib}/koan/opt_parse.py*
+%exclude %{python_sitelib}/koan/text_wrap.py*
+%endif
+
+%{_mandir}/man1/koan.1.gz
+%{_mandir}/man1/cobbler-register.1.gz
+%dir /var/log/koan
+%doc AUTHORS COPYING CHANGELOG README
+
+
+%package -n cobbler-web
+
+Summary: Web interface for Cobbler
+Group: Applications/System
+Requires: cobbler
+Requires: Django
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: python(abi) >= %{pyver}
+%endif
+
+%description -n cobbler-web
+
+Web interface for Cobbler that allows visiting
+http://server/cobbler_web to configure the install server.
+
+%files -n cobbler-web
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING CHANGELOG README
+%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
+%defattr(-,apache,apache,-)
+/usr/share/cobbler/web
+%dir /var/lib/cobbler/webui_sessions
+/var/www/cobbler_webui_content/
+
+%changelog
+* Thu Jun 17 2010 Scott Henson <[e-mail]> - 2.1.0-1
+- Bump upstream release
+
+* Tue Apr 27 2010 Scott Henson <[e-mail]> - 2.0.4-1
+- Bug fix release, see Changelog for details
+
+* Thu Apr 15 2010 Devan Goodwin <[e-mail]> 2.0.3.2-1
+- Tagging for new build tools.
+
+* Mon Mar  1 2010 Scott Henson <[e-mail]> - 2.0.3.1-3
+- Bump release because I forgot cobbler-web
+
+* Mon Mar  1 2010 Scott Henson <[e-mail]> - 2.0.3.1-2
+- Remove requires on mkinitrd as it is not used
+
+* Mon Feb 15 2010 Scott Henson <[e-mail]> - 2.0.3.1-1
+- Upstream Brown Paper Bag Release (see CHANGELOG)
+
+* Thu Feb 11 2010 Scott Henson <[e-mail]> - 2.0.3-1
+- Upstream changes (see CHANGELOG)
+
+* Mon Nov 23 2009 John Eckersberg <[e-mail]> - 2.0.2-1
+- Upstream changes (see CHANGELOG)
+
+* Tue Sep 15 2009 Michael DeHaan <[e-mail]> - 2.0.0-1
+- First release with unified spec files
 
=== renamed file 'cobbler.spec' => 'cobbler.spec.moved'
=== added file 'cobbler/__init__.py'
=== added file 'cobbler/action_acl.py'
--- cobbler/action_acl.py	1970-01-01 00:00:00 +0000
+++ cobbler/action_acl.py	2011-03-11 21:10:49 +0000
@@ -0,0 +1,120 @@
+"""
+Configures acls for various users/groups so they can access the cobbler command
+line as non-root.  Now that CLI is largely remoted (XMLRPC) this is largely just
+useful for not having to log in (access to shared-secret) file but also grants
+access to hand-edit various config files and other useful things.
+
+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 os.path
+import shutil
+import sys
+import glob
+import traceback
+import errno
+import utils
+from cexceptions import *
+from utils import _
+import clogger
+
+class AclConfig:
+
+    def __init__(self,config,logger=None):
+        """
+        Constructor
+        """
+        self.config      = config
+        self.api         = config.api
+        self.settings    = config.settings()
+        if logger is None:
+            logger       = clogger.Logger()
+        self.logger      = logger
+
+    def run(self,adduser=None,addgroup=None,removeuser=None,removegroup=None):
+        """
+        Automate setfacl commands
+        """
+
+        ok = False
+        if adduser:
+            ok = True
+            self.modacl(True,True,adduser)
+        if addgroup:
+            ok = True
+            self.modacl(True,False,addgroup)
+        if removeuser:
+            ok = True
+            self.modacl(False,True,removeuser)
+        if removegroup:
+            ok = True
+            self.modacl(False,False,removegroup) 
+        if not ok:
+            raise CX("no arguments specified, nothing to do")
+     
+    def modacl(self,isadd,isuser,who):
+
+        webdir = self.settings.webdir
+        snipdir = self.settings.snippetsdir
+        tftpboot = utils.tftpboot_location()
+
+        PROCESS_DIRS = {
+           "/var/log/cobbler"          : "rwx",
+           "/var/log/cobbler/tasks"    : "rwx",
+           "/var/lib/cobbler"          : "rwx",
+           "/etc/cobbler"              : "rwx",
+           tftpboot                    : "rwx",
+           "/var/lib/cobbler/triggers" : "rwx"
+        }
+        if not snipdir.startswith("/var/lib/cobbler/"):
+            PROCESS_DIRS[snipdir] = "r"
+
+        cmd = "-R"
+        
+        if isadd:
+           cmd = "%s -m" % cmd
+        else:
+           cmd = "%s -x" % cmd
+
+        if isuser:
+           cmd = "%s u:%s" % (cmd,who)
+        else:
+           cmd = "%s g:%s" % (cmd,who)
+
+        for d in PROCESS_DIRS:
+            how = PROCESS_DIRS[d]
+            if isadd:
+               cmd2 = "%s:%s" % (cmd,how)
+            else:
+               cmd2 = cmd
+
+            cmd2 = "%s %s" % (cmd2,d)
+            rc = utils.subprocess_call(self.logger,"setfacl -d %s" % cmd2,shell=True)
+            if not rc == 0:
+               utils.die(self.logger,"command failed")
+            rc = utils.subprocess_call(self.logger,"setfacl %s" % cmd2,shell=True)
+            if not rc == 0:
+               utils.die(self.logger,"command failed")
+
+
+
+
+
+
 
=== added file 'cobbler/action_buildiso.py'
--- cobbler/action_buildiso.py	1970-01-01 00:00:00 +0000
+++ cobbler/action_buildiso.py	2011-03-11 21:10:49 +0000
@@ -0,0 +1,447 @@
+"""
+Builds non-live bootable CD's that have PXE-equivalent behavior
+for all cobbler profiles currently in memory.
+
+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 os.path
+import shutil
+import sys
+import traceback
+import shutil
+import re
+
+import utils
+from cexceptions import *
+from utils import _
+import clogger
+
+# FIXME: lots of overlap with pxegen.py, should consolidate
+# FIXME: disable timeouts and remove local boot for this?
+HEADER = """
+
+DEFAULT menu
+PROMPT 0
+MENU TITLE Cobbler | http://cobbler.et.redhat.com
+TIMEOUT 200
+TOTALTIMEOUT 6000
+ONTIMEOUT local
+
+LABEL local
+        MENU LABEL (local)
+        MENU DEFAULT
+        KERNEL chain.c32
+        APPEND hd0 0
+
+"""
+
+class BuildIso:
+    """
+    Handles conversion of internal state to the tftpboot tree layout
+    """
+
+    def __init__(self,config,verbose=False,logger=None):
+        """
+        Constructor
+        """
+        self.verbose     = verbose
+        self.config      = config
+        self.api         = config.api
+        self.distros     = config.distros()
+        self.profiles    = config.profiles()
+        self.systems     = config.systems()
+        self.distros     = config.distros()
+        self.distmap     = {}
+        self.distctr     = 0
+        self.source      = ""
+        if logger is None:
+            logger       = clogger.Logger()
+        self.logger      = logger
+
+
+    def make_shorter(self,distname):
+        if self.distmap.has_key(distname):
+            return self.distmap[distname]
+        else:
+            self.distctr = self.distctr + 1
+            self.distmap[distname] = str(self.distctr)
+            return str(self.distctr)
+
+  
+    def generate_netboot_iso(self,imagesdir,isolinuxdir,profiles=None,systems=None,exclude_dns=None):
+        self.logger.info("copying kernels and initrds for profiles")
+        # copy all images in included profiles to images dir
+        for profile in self.api.profiles():
+           use_this = True
+           if profiles is not None:
+              which_profiles = profiles.split(",")
+              if not profile.name in which_profiles:
+                 use_this = False
+
+           if use_this:
+              dist = profile.get_conceptual_parent()
+              if dist.name.lower().find("-xen") != -1:
+                  self.logger.info("skipping Xen distro: %s" % dist.name)
+                  continue
+              distname = self.make_shorter(dist.name)
+              # buildisodir/isolinux/$distro/vmlinuz, initrd.img
+              # FIXME: this will likely crash on non-Linux breeds
+              f1 = os.path.join(isolinuxdir, "%s.krn" % distname)
+              f2 = os.path.join(isolinuxdir, "%s.img" % distname)
+              if not os.path.exists(dist.kernel):
+                 utils.die(self.logger,"path does not exist: %s" % dist.kernel)
+              if not os.path.exists(dist.initrd):
+                 utils.die(self.logger,"path does not exist: %s" % dist.initrd)
+              shutil.copyfile(dist.kernel, f1)
+              shutil.copyfile(dist.initrd, f2)
+
+        if systems is not None:
+           self.logger.info("copying kernels and initrds for systems")
+           # copy all images in included profiles to images dir
+           for system in self.api.systems():
+              if system.name in systems:
+                 profile = system.get_conceptual_parent()
+                 dist = profile.get_conceptual_parent()
+                 if dist.name.find("-xen") != -1:
+                    continue
+                 distname = self.make_shorter(dist.name)
+                 # buildisodir/isolinux/$distro/vmlinuz, initrd.img
+                 # FIXME: this will likely crash on non-Linux breeds
+                 shutil.copyfile(dist.kernel, os.path.join(isolinuxdir, "%s.krn" % distname))
+                 shutil.copyfile(dist.initrd, os.path.join(isolinuxdir, "%s.img" % distname))
+
+        self.logger.info("generating a isolinux.cfg")
+        isolinuxcfg = os.path.join(isolinuxdir, "isolinux.cfg")
+        cfg = open(isolinuxcfg, "w+")
+        cfg.write(HEADER) # fixme, use template
+
+        self.logger.info("generating profile list")
+       #sort the profiles
+        profile_list = [profile for profile in self.profiles]
+        def sort_name(a,b):
+            return cmp(a.name,b.name)
+        profile_list.sort(sort_name)
+
+        for profile in profile_list:
+            use_this = True
+            if profiles is not None:
+                which_profiles = profiles.split(",")
+                if not profile.name in which_profiles:
+                    use_this = False
+
+            if use_this:
+                dist = profile.get_conceptual_parent()
+                if dist.name.find("-xen") != -1:
+                    continue
+                data = utils.blender(self.api, True, profile)
+                distname = self.make_shorter(dist.name)
+
+                cfg.write("\n")
+                cfg.write("LABEL %s\n" % profile.name)
+                cfg.write("  MENU LABEL %s\n" % profile.name)
+                cfg.write("  kernel %s.krn\n" % distname)
+
+                if data["kickstart"].startswith("/"):
+                    data["kickstart"] = "http://%s:%s/cblr/svc/op/ks/profile/%s" % (
+                        data["server"],
+                        self.api.settings().http_port,
+                        profile.name
+                    )
+
+                append_line = "  append initrd=%s.img" % distname
+                append_line = append_line + " ks=%s " % data["kickstart"]
+                append_line = append_line + " %s\n" % data["kernel_options"]
+
+                length=len(append_line)
+                if length>254:
+                   self.logger.warning("append line length is greater than 254 chars: (%s chars)" % length)
+
+                cfg.write(append_line)
+
+        if systems is not None:
+           self.logger.info("generating system list")
+
+           cfg.write("\nMENU SEPARATOR\n")
+
+          #sort the systems
+           system_list = [system for system in self.systems]
+           def sort_name(a,b):
+               return cmp(a.name,b.name)
+           system_list.sort(sort_name)
+
+           for system in system_list:
+               use_this = False
+               if systems is not None:
+                   which_systems = systems.split(",")
+                   if system.name in which_systems:
+                       use_this = True
+
+               if use_this:
+                   profile = system.get_conceptual_parent()
+                   dist = profile.get_conceptual_parent()
+                   if dist.name.find("-xen") != -1:
+                       continue
+                   data = utils.blender(self.api, True, system)
+                   distname = self.make_shorter(dist.name)
+
+                   cfg.write("\n")
+                   cfg.write("LABEL %s\n" % system.name)
+                   cfg.write("  MENU LABEL %s\n" % system.name)
+                   cfg.write("  kernel %s.krn\n" % distname)
+
+                   if data["kickstart"].startswith("/"):
+                       data["kickstart"] = "http://%s:%s/cblr/svc/op/ks/system/%s" % (
+                           data["server"],
+                           self.api.settings().http_port,
+                           system.name
+                       )
+
+                   append_line = "  append initrd=%s.img" % distname
+                   append_line = append_line + " ks=%s" % data["kickstart"]
+                   append_line = append_line + " %s" % data["kernel_options"]
+
+                   # add network info to avoid DHCP only if it is available
+
+                   if data.has_key("bonding_master_eth0") and data["bonding_master_eth0"] != "":
+                      primary_interface = data["bonding_master_eth0"]
+                   else:
+                      primary_interface = "eth0"
+
+                   # check if ksdevice entry exists and use that for network info
+
+                   blended = utils.blender(self.api, False, system) # don't collapse
+
+                   if blended["kernel_options"].has_key("ksdevice") and blended["kernel_options"]["ksdevice"] != "":
+                       ksdevice = blended["kernel_options"]["ksdevice"]
+                       self.logger.info(" - ksdevice %s set for system %s" % (ksdevice,system.name))
+
+                       if data.has_key("ip_address_" + ksdevice ) and data["ip_address_" + ksdevice] != "":
+                           primary_interface = ksdevice
+                       else:
+
+                           for (obj_iname, obj_interface) in data['interfaces'].iteritems():
+                               mac = obj_interface["mac_address"].upper()
+                               ksdevice_mac = ksdevice.upper()
+
+                               if mac == ksdevice_mac:
+                                   primary_interface = obj_iname
+
+
+                   if data.has_key("ip_address_" + primary_interface) and data["ip_address_" + primary_interface] != "":
+                       append_line = append_line + " ip=%s" % data["ip_address_" + primary_interface]
+
+                   if data.has_key("subnet_" + primary_interface) and data["subnet_" + primary_interface] != "":
+                       append_line = append_line + " netmask=%s" % data["subnet_" + primary_interface]
+
+                   if data.has_key("gateway") and data["gateway"] != "":
+                       append_line = append_line + " gateway=%s" % data["gateway"]
+
+                   if not exclude_dns and data.has_key("name_servers") and data["name_servers"]:
+                       append_line = append_line + " dns=%s\n" % ",".join(data["name_servers"])
+
+                   length=len(append_line)
+                   if length > 254:
+                      self.logger.warning("append line length is greater than 254 chars: (%s chars)" % length)
+
+                   cfg.write(append_line)
+
+        self.logger.info("done writing config")
+        cfg.write("\n")
+        cfg.write("MENU END\n")
+        cfg.close()
+
+
+    def generate_standalone_iso(self,imagesdir,isolinuxdir,distname,filesource):
+
+        # Get the distro object for the requested distro
+        # and then get all of its descendants (profiles/sub-profiles/systems)
+        distro = self.api.find_distro(distname)
+        if distro is None:
+            utils.die(self.logger,"distro %s was not found, aborting" % distname)
+        descendants = distro.get_descendants()
+
+        if filesource is None:
+            # Try to determine the source from the distro kernel path
+            self.logger.debug("trying to locate source for distro")
+            found_source = False
+            (source_head, source_tail) = os.path.split(distro.kernel)
+            while source_tail != '':
+                if source_head == os.path.join(self.api.settings().webdir, "ks_mirror"):
+                    filesource = os.path.join(source_head, source_tail)
+                    found_source = True
+                    self.logger.debug("found source in %s" % filesource)
+                    break
+                (source_head, source_tail) = os.path.split(source_head)
+            # Can't find the source, raise an error
+            if not found_source:
+                utils.die(self.logger," Error, no installation source found. When building a standalone ISO, you must specify a --source if the distro install tree is not hosted locally")
+
+        self.logger.info("copying kernels and initrds for standalone distro")
+        # buildisodir/isolinux/$distro/vmlinuz, initrd.img
+        # FIXME: this will likely crash on non-Linux breeds
+        f1 = os.path.join(isolinuxdir, "vmlinuz")
+        f2 = os.path.join(isolinuxdir, "initrd.img")
+        if not os.path.exists(distro.kernel):
+            utils.die(self.logger,"path does not exist: %s" % distro.kernel)
+        if not os.path.exists(distro.initrd):
+            utils.die(self.logger,"path does not exist: %s" % distro.initrd)
+        shutil.copyfile(distro.kernel, f1)
+        shutil.copyfile(distro.initrd, f2)
+
+        cmd = "rsync -rlptgu --exclude=boot.cat --exclude=TRANS.TBL --exclude=isolinux/ %s/ %s/../" % (filesource, isolinuxdir)
+        self.logger.info("- copying distro %s files (%s)" % (distname,cmd))
+        rc = utils.subprocess_call(self.logger, cmd, shell=True)
+        if rc:
+            utils.die(self.logger,"rsync of files failed")
+
+        self.logger.info("generating a isolinux.cfg")
+        isolinuxcfg = os.path.join(isolinuxdir, "isolinux.cfg")
+        cfg = open(isolinuxcfg, "w+")
+        cfg.write(HEADER) # fixme, use template
+
+        for descendant in descendants:
+            data = utils.blender(self.api, True, descendant)
+
+            cfg.write("\n")
+            cfg.write("LABEL %s\n" % descendant.name)
+            cfg.write("  MENU LABEL %s\n" % descendant.name)
+            cfg.write("  kernel vmlinuz\n")
+
+            data["kickstart"] = "cdrom:/isolinux/ks-%s.cfg" % descendant.name
+
+            append_line = "  append initrd=initrd.img"
+            append_line = append_line + " ks=%s " % data["kickstart"]
+            append_line = append_line + " %s\n" % data["kernel_options"]
+
+            cfg.write(append_line)
+
+            if descendant.COLLECTION_TYPE == 'profile':
+                kickstart_data = self.api.kickgen.generate_kickstart_for_profile(descendant.name)
+            elif descendant.COLLECTION_TYPE == 'system':
+                kickstart_data = self.api.kickgen.generate_kickstart_for_system(descendant.name)
+
+            cdregex = re.compile("url .*\n", re.IGNORECASE)
+            kickstart_data = cdregex.sub("cdrom\n", kickstart_data)
+
+            ks_name = os.path.join(isolinuxdir, "ks-%s.cfg" % descendant.name)
+            ks_file = open(ks_name, "w+")
+            ks_file.write(kickstart_data)
+            ks_file.close()
+
+        self.logger.info("done writing config")
+        cfg.write("\n")
+        cfg.write("MENU END\n")
+        cfg.close()
+
+        return
+
+
+    def run(self,iso=None,buildisodir=None,profiles=None,systems=None,distro=None,standalone=None,source=None,exclude_dns=None):
+
+        self.settings = self.config.settings()
+
+        # the distro option is for stand-alone builds only
+        if not standalone and distro is not None:
+            utils.die(self.logger,"The --distro option should only be used when creating a standalone ISO")
+        # if building standalone, we only want --distro,
+        # profiles/systems are disallowed
+        if standalone:
+            if profiles is not None or systems is not None:
+                utils.die(self.logger,"When building a standalone ISO, use --distro only instead of --profiles/--systems")
+            elif distro is None:
+                utils.die(self.logger,"When building a standalone ISO, you must specify a --distro")
+            if source != None and not os.path.exists(source):
+                utils.die(self.logger,"The source specified (%s) does not exist" % source)
+
+        # if iso is none, create it in . as "kickstart.iso"
+        if iso is None:
+            iso = "kickstart.iso"
+
+        if buildisodir is None:
+            buildisodir = self.settings.buildisodir
+        else:
+            if not os.path.isdir(buildisodir):
+                utils.die(self.logger,"The --tempdir specified is not a directory")
+
+            (buildisodir_head,buildisodir_tail) = os.path.split(os.path.normpath(buildisodir))
+            if buildisodir_tail != "buildiso":
+                buildisodir = os.path.join(buildisodir, "buildiso")
+
+        self.logger.info("using/creating buildisodir: %s" % buildisodir)
+        if not os.path.exists(buildisodir):
+            os.makedirs(buildisodir)
+        else:
+            shutil.rmtree(buildisodir)
+            os.makedirs(buildisodir)
+
+        # if base of buildisodir does not exist, fail
+        # create all profiles unless filtered by "profiles"
+
+        imagesdir = os.path.join(buildisodir, "images")
+        isolinuxdir = os.path.join(buildisodir, "isolinux")
+
+        self.logger.info("building tree for isolinux")
+        if not os.path.exists(imagesdir):
+            os.makedirs(imagesdir)
+        if not os.path.exists(isolinuxdir):
+            os.makedirs(isolinuxdir)
+
+        self.logger.info("copying miscellaneous files")
+
+        isolinuxbin = "/usr/share/syslinux/isolinux.bin"
+        if not os.path.exists(isolinuxbin):
+            isolinuxbin = "/usr/lib/syslinux/isolinux.bin"
+
+        menu = "/usr/share/syslinux/menu.c32"
+        if not os.path.exists(menu):
+            menu = "/var/lib/cobbler/loaders/menu.c32"
+
+        chain = "/usr/share/syslinux/chain.c32"
+        if not os.path.exists(chain):
+            chain = "/usr/lib/syslinux/chain.c32"
+
+        files = [ isolinuxbin, menu, chain ]
+        for f in files:
+            if not os.path.exists(f):
+               utils.die(self.logger,"Required file not found: %s" % f)
+            else:
+               utils.copyfile(f, os.path.join(isolinuxdir, os.path.basename(f)), self.api)
+
+        if standalone:
+            self.generate_standalone_iso(imagesdir,isolinuxdir,distro,source)
+        else:
+            self.generate_netboot_iso(imagesdir,isolinuxdir,profiles,systems,exclude_dns)
+
+        # removed --quiet
+        cmd = "mkisofs -o %s -r -b isolinux/isolinux.bin -c isolinux/boot.cat" % iso
+        cmd = cmd + " -no-emul-boot -boot-load-size 4"
+        cmd = cmd + " -boot-info-table -V Cobbler\ Install -R -J -T %s" % buildisodir
+
+        rc = utils.subprocess_call(self.logger, cmd, shell=True)
+        if rc != 0:
+            utils.die(self.logger,"mkisofs failed")
+
+        self.logger.info("ISO build complete")
+        self.logger.info("You may wish to delete: %s" % buildisodir)
+        self.logger.info("The output file is: %s" % iso)
+
+        return True
+
 
=== added file 'cobbler/action_check.py'
--- cobbler/action_check.py	1970-01-01 00:00:00 +0000
+++ cobbler/action_check.py	2011-03-11 21:10:49 +0000
@@ -0,0 +1,482 @@
+"""
+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 })
+
 
=== added file 'cobbler/action_dlcontent.py'
--- cobbler/action_dlcontent.py	1970-01-01 00:00:00 +0000
+++ cobbler/action_dlcontent.py	2011-03-11 21:10:49 +0000
@@ -0,0 +1,96 @@
+"""
+Downloads bootloader content for all arches for when the user doesn't want to supply their own.
+
+Copyright 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 urlgrabber
+import clogger
+
+class ContentDownloader:
+
+   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,force=False):
+       """
+       Download bootloader content for all of the latest bootloaders, since the user
+       has chosen to not supply their own.  You may ask "why not get this from yum", though
+       Fedora has no IA64 repo, for instance, and we also want this to be able to work on Debian and
+       further do not want folks to have to install a cross compiler.  For those that don't like this approach
+       they can still source their cross-arch bootloader content manually.
+       """
+
+       content_server = "http://dgoodwin.fedorapeople.org/loaders"
+       dest = "/var/lib/cobbler/loaders"
+
+       files = (
+          ( "%s/README" % content_server, "%s/README" % dest ),
+          ( "%s/COPYING.elilo" % content_server, "%s/COPYING.elilo" % dest ),
+          ( "%s/COPYING.yaboot" % content_server, "%s/COPYING.yaboot" % dest),
+          ( "%s/COPYING.syslinux" % content_server, "%s/COPYING.syslinux" % dest),
+          ( "%s/elilo-3.8-ia64.efi" % content_server, "%s/elilo-ia64.efi" % dest ),
+          ( "%s/yaboot-1.3.14-12" % content_server, "%s/yaboot" % dest),
+          ( "%s/pxelinux.0-3.61" % content_server, "%s/pxelinux.0" % dest),
+          ( "%s/menu.c32-3.61" % content_server, "%s/menu.c32" % dest),
+          ( "%s/grub-0.97-x86.efi" % content_server, "%s/grub-x86.efi" % dest),
+          ( "%s/grub-0.97-x86_64.efi" % content_server, "%s/grub-x86_64.efi" % dest),
+       )
+
+       proxies = {} 
+       for var in os.environ.keys():
+          if (var.lower() == "http_proxy"):
+             proxies['http'] = os.environ[var]
+
+          if (var.lower() == "ftp_proxy"):
+             proxies['ftp'] = os.environ[var]
+
+       if (len(proxies) > 0):
+          for f in files:
+             src = f[0]
+             dst = f[1]
+             if os.path.exists(dst) and not force:
+                self.logger.info("path %s already exists, not overwriting existing content, use --force if you wish to update" % dst)
+                continue
+             os.chdir(dest)
+             self.logger.info("downloading %s to %s" % (src,dst))
+             urlgrabber.grabber.urlgrab(src, proxies=proxies)  
+
+       else:
+          self.logger.info("downloading content required to netboot all arches")
+          for f in files:
+             src = f[0]
+             dst = f[1]
+             if os.path.exists(dst) and not force:
+                self.logger.info("path %s already exists, not overwriting existing content, use --force if you wish to update" % dst)
+                continue
+          self.logger.info("downloading %s to %s" % (src,dst))
+          urlgrabber.urlgrab(src,dst)
+
+       return True
+
 
=== added file 'cobbler/action_hardlink.py'
--- cobbler/action_hardlink.py	1970-01-01 00:00:00 +0000
+++ cobbler/action_hardlink.py	2011-03-11 21:10:49 +0000
@@ -0,0 +1,60 @@
+"""
+Hard links cobbler content together to save space.
+
+Copyright 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 utils
+from cexceptions import *
+import clogger
+
+class HardLinker:
+
+    def __init__(self,config,logger=None):
+        """
+        Constructor
+        """
+        #self.config   = config
+        #self.api      = config.api
+        #self.settings = config.settings()
+        if logger is None:
+            logger       = clogger.Logger()
+        self.logger      = logger
+
+
+    def run(self):
+        """
+        Simply hardlinks directories that are cobbler managed.
+        This is a /very/ simple command but may grow more complex
+        and intelligent over time.
+        """
+
+        # FIXME: if these directories become configurable some
+        # changes will be required here.
+
+        if not os.path.exists("/usr/sbin/hardlink"):
+            utils.die(self.logger,"please install 'hardlink' (/usr/sbin/hardlink) to use this feature")
+
+        self.logger.info("now hardlinking to save space, this may take some time.")
+
+        rc = utils.subprocess_call(self.logger,"/usr/sbin/hardlink -c -v /var/www/cobbler/ks_mirror /var/www/cobbler/repo_mirror",shell=True)
+
+        return rc
+
 
=== added file 'cobbler/action_import.py'
--- cobbler/action_import.py	1970-01-01 00:00:00 +0000
+++ cobbler/action_import.py	2011-03-11 21:10:49 +0000
@@ -0,0 +1,1332 @@
+"""
+Enables the "cobbler import" command to seed cobbler
+information with available distribution from rsync mirrors
+and mounted DVDs.
+
+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
+"""
+
+from cexceptions import *
+import os
+import os.path
+import re
+import traceback
+import glob
+import api
+import utils
+import shutil
+from utils import _
+import item_repo
+import clogger
+
+# FIXME: add --quiet depending on if not --verbose?
+RSYNC_CMD =  "rsync -a %s '%s' %s/ks_mirror/%s --exclude-from=/etc/cobbler/rsync.exclude --progress"
+
+class Importer:
+
+    def __init__(self,api,config,mirror,mirror_name,network_root=None,kickstart_file=None,rsync_flags=None,arch=None,breed=None,os_version=None,logger=None):
+        """
+        Performs an import of a install tree (or trees) from the given
+        mirror address.  The prefix of the distro is to be specified
+        by mirror name.  For instance, if FC-6 is given, FC-6-xen-i386
+        would be a potential distro that could be created.  For content
+        available on external servers via a known nfs:// or ftp:// or
+        http:// path, we can import without doing rsync mirorring to
+        cobbler's http directory.  This is explained in more detail
+        in the manpage.  Leave network_root to None if want mirroring.
+        """
+        self.api = api
+        self.config = config
+        self.mirror = mirror
+        self.mirror_name = mirror_name
+        self.network_root = network_root
+        self.distros  = config.distros()
+        self.profiles = config.profiles()
+        self.systems  = config.systems()
+        self.settings = config.settings()
+        self.kickstart_file = kickstart_file
+        self.rsync_flags = rsync_flags
+        self.arch = arch
+        self.breed = breed
+        self.os_version = os_version
+        if logger is None:
+            logger       = clogger.Logger()
+        self.logger      = logger
+
+
+    # ========================================================================
+
+    def run(self):
+
+        """
+        This contains the guts of the import command.
+        """
+
+        # 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.breed == "":          self.breed          = 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
+
+        # 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 [ "i386", "ia64", "ppc", "ppc64", "s390", "s390x", "x86_64", ]:
+                utils.die(self.logger,"arch must be i386, ia64, ppc, ppc64, s390, s390x or x86_64")
+
+        # if we're going to do any copying, set where to put things
+        # and then make sure nothing is already there.
+
+        mpath = os.path.join(self.settings.webdir, "ks_mirror", self.mirror_name)
+        if os.path.exists(mpath) 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." % mpath)
+
+        # 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 [ "redhat", "debian", "ubuntu", "windows" ]:
+        #if self.breed and self.breed.lower() not in [ "redhat" ]:
+        if self.breed and self.breed.lower() not in [ "redhat", "vmware" ]:
+            utils.die(self.logger,"Supplied import breed is not supported")
+
+        # 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 [ "i386", "ia64", "ppc", "ppc64", "s390", "s390x", "x86_64", "x86", ]:
+                if self.mirror_name.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.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
+
+            self.path = os.path.normpath( "%s/ks_mirror/%s" % (self.settings.webdir, self.mirror_name) )
+            self.mkdir(self.path)
+
+            # prevent rsync from creating the directory name twice
+            # if we are copying via rsync
+
+            if not self.mirror.endswith("/"):
+                self.mirror = "%s/" % self.mirror
+
+            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
+
+                spacer = ""
+                if not self.mirror.startswith("rsync://") and not self.mirror.startswith("/"):
+                    spacer = ' -e "ssh" '
+                rsync_cmd = RSYNC_CMD
+                if self.rsync_flags:
+                    rsync_cmd = rsync_cmd + " " + self.rsync_flags
+
+                # kick off the rsync now
+
+                self.run_this(rsync_cmd, (spacer, self.mirror, self.settings.webdir, self.mirror_name))
+
+        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
+
+    # ----------------------------------------------------------------------
+
+    def mkdir(self, dir):
+
+        """
+        A more tolerant mkdir.
+        FIXME: use the one in utils.py (?)
+        """
+
+        try:
+            os.makedirs(dir)
+        except OSError , ex:
+            if ex.strerror == "Permission denied":
+                utils.die(self.logger, "Permission denied at %s" % dir)
+        except:
+            pass
+
+    # ----------------------------------------------------------------------
+
+    def run_this(self, cmd, args):
+
+        """
+        A simple wrapper around subprocess calls.
+        """
+
+        my_cmd = cmd % args
+        rc = utils.subprocess_call(self.logger,my_cmd,shell=True)
+        if rc != 0:
+            utils.die(self.logger,"Command failed")
+
+    # =======================================================================
+
+    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)
+            importer = import_factory(kdir,self.path,self.breed,self.logger)
+            if self.kickstart_file == None:
+                for rpm in importer.get_release_files():
+                    # FIXME : This redhat specific check should go into the importer.find_release_files method
+                    if rpm.find("notes") != -1:
+                        continue
+                    results = importer.scan_pkg_filename(rpm)
+                    # FIXME : If os is not found on tree but set with CLI, no kickstart is searched
+                    if results is None:
+                        self.logger.warning("No version found on imported tree")
+                        continue
+                    (flavor, major, minor) = results
+                    version , ks = importer.set_variance(flavor, major, minor, distro.arch)
+                    if self.os_version:
+                        if self.os_version != version:
+                            utils.die(self.logger,"CLI version differs from tree : %s vs. %s" % (self.os_version,version))
+                    ds = importer.get_datestamp()
+                    distro.set_comment("%s.%s" % (version, int(minor)))
+                    distro.set_os_version(version)
+                    if ds is not None:
+                        distro.set_tree_build_time(ds)
+                    profile.set_kickstart(ks)
+                    self.profiles.add(profile,save=True)
+
+            self.configure_tree_location(distro,importer)
+            self.distros.add(distro,save=True) # re-save
+            self.api.serialize()
+
+    # ==========================================================================
+
+
+    def configure_tree_location(self, distro, importer):
+
+        """
+        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 = importer.get_rootdir()
+
+        if self.network_root is None:
+            if distro.breed == "debian" or distro.breed == "ubuntu":
+                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)
+            else:
+                dest_link = os.path.join(self.settings.webdir, "links", distro.name)
+                # create the links directory only if we are mirroring because with
+                # SELinux Apache can't symlink to NFS (without some doing)
+                if not os.path.exists(dest_link):
+                    try:
+                        os.symlink(base, dest_link)
+                    except:
+                        # this shouldn't happen but I've seen it ... debug ...
+                        self.logger.warning("symlink creation failed: %(base)s, %(dest)s") % { "base" : base, "dest" : dest_link }
+                # how we set the tree depends on whether an explicit network_root was specified
+                tree = "http://@@http_server@@/cblr/links/%s" % (distro.name)
+            importer.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
+            importer.set_install_tree( distro, tree)
+
+    # ============================================================================
+
+    def path_tail(self, apath, bpath):
+        """
+        Given two paths (B is longer than A), find the part in B not in A
+        """
+        position = bpath.find(apath)
+        if position != 0:
+            utils.die(self.logger, "- warning: possible symlink traversal?: %s")
+        rposition = position + len(self.mirror)
+        result = bpath[rposition:]
+        if not result.startswith("/"):
+            result = "/" + result
+        return result
+
+    # ======================================================================
+
+    def repo_finder(self,distros_added):
+
+        """
+        This routine looks through all distributions and tries to find
+        any applicable repositories in those distributions for post-install
+        usage.
+        """
+
+        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)
+                importer = import_factory(basepath,self.path,self.breed,self.logger)
+                top = importer.get_rootdir()
+                self.logger.info("descent into %s" % top)
+                if distro.breed in [ "debian" , "ubuntu" ]:
+                    dists_path = os.path.join( self.path , "dists" )
+                    if not os.path.isdir( dists_path ):
+                        importer.process_repos( self , distro )
+                else:
+                    # FIXME : The location of repo definition is known from breed
+                    os.path.walk(top, self.repo_scanner, distro)
+            else:
+                self.logger.info("this distro isn't mirrored")
+
+    # ========================================================================
+
+
+    def repo_scanner(self,distro,dirname,fnames):
+
+        """
+        This is an os.path.walk routine that looks for potential yum repositories
+        to be added to the configuration for post-install usage.
+        """
+
+        matches = {}
+        for x in fnames:
+            if x == "base" or x == "repodata":
+                self.logger.info("processing repo at : %s" % dirname)
+                # only run the repo scanner on directories that contain a comps.xml
+                gloob1 = glob.glob("%s/%s/*comps*.xml" % (dirname,x))
+                if len(gloob1) >= 1:
+                    if matches.has_key(dirname):
+                        self.logger.info("looks like we've already scanned here: %s" % dirname)
+                        continue
+                    self.logger.info("need to process repo/comps: %s" % dirname)
+                    self.process_comps_file(dirname, distro)
+                    matches[dirname] = 1
+                else:
+                    self.logger.info("directory %s is missing xml comps file, skipping" % dirname)
+                    continue
+
+    # =======================================================================================
+
+
+
+    def process_comps_file(self, comps_path, distro):
+        """
+        When importing Fedora/EL certain parts of the install tree can also be used
+        as yum repos containing packages that might not yet be available via updates
+        in yum.  This code identifies those areas.
+        """
+
+        processed_repos = {}
+
+        masterdir = "repodata"
+        if not os.path.exists(os.path.join(comps_path, "repodata")):
+            # older distros...
+            masterdir = "base"
+
+        # figure out what our comps file is ...
+        self.logger.info("looking for %(p1)s/%(p2)s/*comps*.xml" % { "p1" : comps_path, "p2" : masterdir })
+        files = glob.glob("%s/%s/*comps*.xml" % (comps_path, masterdir))
+        if len(files) == 0:
+            self.logger.info("no comps found here: %s" % os.path.join(comps_path, masterdir))
+            return # no comps xml file found
+
+        # pull the filename from the longer part
+        comps_file = files[0].split("/")[-1]
+
+        try:
+
+            # store the yum configs on the filesystem so we can use them later.
+            # and configure them in the kickstart post, etc
+
+            counter = len(distro.source_repos)
+
+            # find path segment for yum_url (changing filesystem path to http:// trailing fragment)
+            seg = comps_path.rfind("ks_mirror")
+            urlseg = comps_path[seg+10:]
+
+            # write a yum config file that shows how to use the repo.
+            if counter == 0:
+                dotrepo = "%s.repo" % distro.name
+            else:
+                dotrepo = "%s-%s.repo" % (distro.name, counter)
+
+            fname = os.path.join(self.settings.webdir, "ks_mirror", "config", "%s-%s.repo" % (distro.name, counter))
+
+            repo_url = "http://@@http_server@@/cobbler/ks_mirror/config/%s-%s.repo" % (distro.name, counter)
+
+            repo_url2 = "http://@@http_server@@/cobbler/ks_mirror/%s" % (urlseg)
+
+            distro.source_repos.append([repo_url,repo_url2])
+
+            # NOTE: the following file is now a Cheetah template, so it can be remapped
+            # during sync, that's why we have the @@http_server@@ left as templating magic.
+            # repo_url2 is actually no longer used. (?)
+
+            config_file = open(fname, "w+")
+            config_file.write("[core-%s]\n" % counter)
+            config_file.write("name=core-%s\n" % counter)
+            config_file.write("baseurl=http://@@http_server@@/cobbler/ks_mirror/%s\n" % (urlseg))
+            config_file.write("enabled=1\n")
+            config_file.write("gpgcheck=0\n")
+            config_file.write("priority=$yum_distro_priority\n")
+            config_file.close()
+
+            # don't run creatrepo twice -- this can happen easily for Xen and PXE, when
+            # they'll share same repo files.
+
+            if not processed_repos.has_key(comps_path):
+                utils.remove_yum_olddata(comps_path)
+                #cmd = "createrepo --basedir / --groupfile %s %s" % (os.path.join(comps_path, masterdir, comps_file), comps_path)
+                cmd = "createrepo %s --groupfile %s %s" % (self.settings.createrepo_flags,os.path.join(comps_path, masterdir, comps_file), comps_path)
+                utils.subprocess_call(self.logger, cmd, shell=True)
+                processed_repos[comps_path] = 1
+                # for older distros, if we have a "base" dir parallel with "repodata", we need to copy comps.xml up one...
+                p1 = os.path.join(comps_path, "repodata", "comps.xml")
+                p2 = os.path.join(comps_path, "base", "comps.xml")
+                if os.path.exists(p1) and os.path.exists(p2):
+                    shutil.copyfile(p1,p2)
+
+        except:
+            self.logger.error("error launching createrepo (not installed?), ignoring")
+            utils.log_exc(self.logger)
+
+
+    # ========================================================================
+
+    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
+
+        # make sure we don't mismatch PAE and non-PAE types
+        pae_initrd = None
+        pae_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):
+                    # Prevent infinite loop with Sci Linux 5
+                    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" and x != "initrd.addrsize":
+                if x.find("PAE") == -1:
+                    initrd = os.path.join(dirname,x)
+                else:
+                    pae_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:
+                if x.find("PAE") == -1:
+                    kernel = os.path.join(dirname,x)
+                else:
+                    pae_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 and dirname.find("isolinux") == -1:
+                adtls.append(self.add_entry(dirname,kernel,initrd))
+                kernel = None
+                initrd = None
+            elif pae_initrd is not None and pae_kernel is not None and dirname.find("isolinux") == -1:
+                adtls.append(self.add_entry(dirname,pae_kernel,pae_initrd))
+                pae_kernel = None
+                pae_initrd = None
+            elif initrd is not None and kernel is not None and dirname.find("VMware") == -1:
+                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))
+
+        importer = import_factory(dirname,self.path,self.breed,self.logger)
+
+        archs = importer.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,importer.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,importer.get_pkgdir()))
+                return
+
+            archs = [ proposed_arch ]
+
+        if importer.breed == "ubuntu" and dirname.find("ubuntu-installer") == -1:
+            self.logger.info("skipping entry, there are no netboot images")
+            return
+
+
+        if len(archs)>1:
+            if importer.breed in [ "redhat" ]:
+                self.logger.warning("directory %s holds multiple arches : %s" % (dirname, archs))
+                return
+            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(importer.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)
+            if self.kickstart_file:
+                profile.set_kickstart(self.kickstart_file)
+            else:
+                profile.set_kickstart(importer.ks)
+
+            # 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)
+
+            # Create a rescue image as well, if this is not a xen distro
+            # but only for red hat profiles
+
+            # this code disabled as it seems to be adding "-rescue" to
+            # distros that are /not/ rescue related, which is wrong.
+            # left as a FIXME for those who find this feature interesting.
+
+            #if name.find("-xen") == -1 and importer.breed == "redhat":
+            #    rescue_name = 'rescue-' + name
+            #    existing_profile = self.profiles.find(name=rescue_name)
+            #
+            #    if existing_profile is None:
+            #        self.logger.info("creating new profile: %s" % rescue_name)
+            #        profile = self.config.new_profile()
+            #    else:
+            #        continue
+            #
+            #    profile.set_name(rescue_name)
+            #    profile.set_distro(name)
+            #    profile.set_virt_type("qemu")
+            #    profile.kernel_options['rescue'] = None
+            #    profile.kickstart = '/var/lib/cobbler/kickstarts/pxerescue.ks'
+            #
+            #    self.profiles.add(profile,save=True)
+
+        # self.api.serialize() # not required, is implicit
+
+        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 guess_breed(kerneldir,path,cli_breed,logger):
+
+    """
+    This tries to guess the distro. Traverses from kernel dir to imported root checking
+    for distro signatures, which are the locations in media where the search for release
+    packages should start.  When a debian/ubuntu pool is found, the upper directory should
+    be checked to get the real breed. If we are on a real media, the upper directory will
+    be at the same level, as a local '.' symlink
+    The lowercase names are required for fat32/vfat filesystems
+    """
+    signatures = [
+       [ 'pool'        , "debian" ],
+       [ 'VMware/RPMS' , "vmware" ],
+       [ 'imagedd.bz2' , "vmware" ],
+       [ 'RedHat/RPMS' , "redhat" ],
+       [ 'RedHat/rpms' , "redhat" ],
+       [ 'RedHat/Base' , "redhat" ],
+       [ 'Fedora/RPMS' , "redhat" ],
+       [ 'Fedora/rpms' , "redhat" ],
+       [ 'CentOS/RPMS' , "redhat" ],
+       [ 'CentOS/rpms' , "redhat" ],
+       [ 'CentOS'      , "redhat" ],
+       [ 'Packages'    , "redhat" ],
+       [ 'Fedora'      , "redhat" ],
+       [ 'Server'      , "redhat" ],
+       [ 'Client'      , "redhat" ],
+       [ 'SL'          , "redhat" ],
+       [ 'isolinux.bin', None ],
+    ]
+    guess = None
+
+    while kerneldir != os.path.dirname(path) :
+        logger.info("scanning %s for distro signature" % kerneldir)
+        for (x, breedguess) in signatures:
+            d = os.path.join( kerneldir , x )
+            if os.path.exists( d ):
+                guess = breedguess
+                break
+        if guess:
+            break
+
+        kerneldir = os.path.dirname(kerneldir)
+    else:
+        if cli_breed:
+            logger.info("Warning: No distro signature for kernel at %s, using value from command line" % kerneldir)
+            return (cli_breed , kerneldir , None)
+        utils.die(logger, "No distro signature for kernel at %s" % kerneldir )
+
+    if guess == "debian" :
+        for suite in [ "debian" , "ubuntu" ] :
+            # 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( kerneldir , suite )
+            if os.path.islink(d) and os.path.isdir(d):
+                if os.path.realpath(d) == os.path.realpath(kerneldir):
+                    return (suite, kerneldir ,x)
+            if os.path.basename( kerneldir ) == suite :
+                return (suite , kerneldir , x)
+
+    return (guess, kerneldir , x)
+
+# ============================================================
+
+
+def import_factory(kerneldir,path,cli_breed,logger):
+    """
+    Given a directory containing a kernel, return an instance of an Importer
+    that can be used to complete the import.
+    """
+
+    breed , rootdir, pkgdir = guess_breed(kerneldir,path,cli_breed,logger)
+    # NOTE : The guess_breed code should be included in the factory, in order to make
+    # the real root directory available, so allowing kernels at different levels within
+    # the same tree (removing the isolinux rejection from distro_adder) -- JP
+
+    if isinstance(rootdir, list):
+        if rootdir[1]:
+            logger.info("found content (breed=%s) at %s" % (breed,os.path.join( rootdir[0] , rootdir[1])))
+        else:
+            logger.info("found content (breed=%s) at %s" % (breed,rootdir[0]))
+    else:
+        logger.info("found content (breed=%s) at %s" % (breed,rootdir))
+
+    if cli_breed:
+        if cli_breed != breed:
+            utils.die(logger, "Requested breed (%s); breed found is %s" % ( cli_breed , breed ) )
+        breed = cli_breed
+
+    if breed == "redhat":
+        return RedHatImporter(logger,rootdir,pkgdir)
+    if breed == "vmware":
+        return VMwareImporter(logger,rootdir,pkgdir)
+    # disabled for 2.0
+    #elif breed == "debian":
+    #    return DebianImporter(logger,rootdir,pkgdir)
+    #elif breed == "ubuntu":
+    #    return UbuntuImporter(logger,rootdir,pkgdir)
+    elif breed:
+        utils.die(logger, "Unsupported OS breed %s" % breed)
+
+
+class BaseImporter:
+    """
+    Base class for distribution specific importer code.
+    """
+
+    # FIXME : Rename learn_arch_from_tree into guess_arch and simplify.
+    # FIXME : Drop package extension check and make a single search for all names.
+    # FIXME:  Next methods to be moved here: kickstart_finder TRY_LIST loop
+
+    # ===================================================================
+
+    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 [ "i386" , "x86_64" , "ia64" , "ppc64", "ppc", "s390", "s390x" ]:
+                    if x.find(arch) != -1:
+                        foo[arch] = 1
+                for arch in [ "i686" , "amd64" ]:
+                    if x.find(arch) != -1:
+                        foo[arch] = 1
+
+    # ===================================================================
+
+    def get_rootdir(self):
+        return self.rootdir
+
+    # ===================================================================
+
+    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 get_datestamp(self):
+        """
+        Allows each breed to return its datetime stamp
+        """
+        return None
+    # ===================================================================
+
+    def __init__(self,logger,rootdir,pkgdir):
+        raise exceptions.NotImplementedError
+
+    # ===================================================================
+
+    def process_repos(self, main_importer, distro):
+        raise exceptions.NotImplementedError
+
+# ===================================================================
+# ===================================================================
+
+class RedHatImporter ( BaseImporter ) :
+
+    def __init__(self,logger,rootdir,pkgdir):
+        self.breed = "redhat"
+        self.ks = "/var/lib/cobbler/kickstarts/default.ks"
+        self.rootdir = rootdir
+        self.pkgdir = pkgdir
+        self.logger = logger
+
+    # ================================================================
+
+    def get_release_files(self):
+        data = glob.glob(os.path.join(self.get_pkgdir(), "*release-*"))
+        data2 = []
+        for x in data:
+            b = os.path.basename(x)
+            if b.find("fedora") != -1 or \
+               b.find("redhat") != -1 or \
+               b.find("centos") != -1:
+                data2.append(x)
+        return data2
+
+    # ================================================================
+
+    def match_kernelarch_file(self, filename):
+        """
+        Is the given filename a kernel filename?
+        """
+
+        if not filename.endswith("rpm") and not filename.endswith("deb"):
+            return False
+        for match in ["kernel-header", "kernel-source", "kernel-smp", "kernel-largesmp", "kernel-hugemem", "linux-headers-", "kernel-devel", "kernel-"]:
+            if filename.find(match) != -1:
+                return True
+        return False
+
+    # ================================================================
+
+    def scan_pkg_filename(self, rpm):
+        """
+        Determine what the distro is based on the release package filename.
+        """
+
+        rpm = os.path.basename(rpm)
+
+        # if it looks like a RHEL RPM we'll cheat.
+        # it may be slightly wrong, but it will be close enough
+        # for RHEL5 we can get it exactly.
+
+        for x in [ "4AS", "4ES", "4WS", "4common", "4Desktop" ]:
+            if rpm.find(x) != -1:
+                return ("redhat", 4, 0)
+        for x in [ "3AS", "3ES", "3WS", "3Desktop" ]:
+            if rpm.find(x) != -1:
+                return ("redhat", 3, 0)
+        for x in [ "2AS", "2ES", "2WS", "2Desktop" ]:
+            if rpm.find(x) != -1:
+                return ("redhat", 2, 0)
+
+        # now get the flavor:
+        flavor = "redhat"
+        if rpm.lower().find("fedora") != -1:
+            flavor = "fedora"
+        if rpm.lower().find("centos") != -1:
+            flavor = "centos"
+
+        # get all the tokens and try to guess a version
+        accum = []
+        tokens = rpm.split(".")
+        for t in tokens:
+            tokens2 = t.split("-")
+            for t2 in tokens2:
+                try:
+                    float(t2)
+                    accum.append(t2)
+                except:
+                    pass
+
+        major = float(accum[0])
+        minor = float(accum[1])
+        return (flavor, major, minor)
+
+    def get_datestamp(self):
+        """
+        Based on a RedHat tree find the creation timestamp
+        """
+        base = self.get_rootdir()
+        if os.path.exists("%s/.discinfo" % base):
+            discinfo = open("%s/.discinfo" % base, "r")
+            datestamp = discinfo.read().split("\n")[0]
+            discinfo.close()
+        else:
+            return 0
+        return float(datestamp)
+
+    def set_variance(self, flavor, major, minor, arch):
+
+        """
+        find the profile kickstart and set the distro breed/os-version based on what
+        we can find out from the rpm filenames and then return the kickstart
+        path to use.
+        """
+
+        if flavor == "fedora":
+
+            # this may actually fail because the libvirt/virtinst database
+            # is not always up to date.  We keep a simplified copy of this
+            # in codes.py.  If it fails we set it to something generic
+            # and don't worry about it.
+
+            try:
+                os_version = "fedora%s" % int(major)
+            except:
+                os_version = "other"
+
+        if flavor == "redhat" or flavor == "centos":
+
+            if major <= 2:
+                # rhel2.1 is the only rhel2
+                os_version = "rhel2.1"
+            else:
+                try:
+                    # must use libvirt version
+                    os_version = "rhel%s" % (int(major))
+                except:
+                    os_version = "other"
+
+        kickbase = "/var/lib/cobbler/kickstarts"
+        # Look for ARCH/OS_VERSION.MINOR kickstart first
+        #          ARCH/OS_VERSION next
+        #          OS_VERSION next
+        #          OS_VERSION.MINOR next
+        #          ARCH/default.ks next
+        #          FLAVOR.ks next
+        kickstarts = [
+            "%s/%s/%s.%i.ks" % (kickbase,arch,os_version,int(minor)),
+            "%s/%s/%s.ks" % (kickbase,arch,os_version),
+            "%s/%s.%i.ks" % (kickbase,os_version,int(minor)),
+            "%s/%s.ks" % (kickbase,os_version),
+            "%s/%s/default.ks" % (kickbase,arch),
+            "%s/%s.ks" % (kickbase,flavor),
+        ]
+        for kickstart in kickstarts:
+            if os.path.exists(kickstart):
+                return os_version, kickstart
+
+        major = int(major)
+
+        if flavor == "fedora":
+            if major >= 8:
+                return os_version , "/var/lib/cobbler/kickstarts/sample_end.ks"
+            if major >= 6:
+                return os_version , "/var/lib/cobbler/kickstarts/sample.ks"
+
+        if flavor == "redhat" or flavor == "centos":
+            if major >= 5:
+                return os_version , "/var/lib/cobbler/kickstarts/sample.ks"
+
+            return os_version , "/var/lib/cobbler/kickstarts/legacy.ks"
+
+        self.logger.warning("could not use distro specifics, using rhel 4 compatible kickstart")
+        return None , "/var/lib/cobbler/kickstarts/legacy.ks"
+
+
+class VMwareImporter (BaseImporter):
+    """ 
+    VMware specific importer code.
+    """
+
+    def __init__(self,logger,rootdir,pkgdir):
+        self.breed = "vmware"
+        self.ks = "/var/lib/cobbler/kickstarts/default.ks"
+        self.rootdir = rootdir
+        self.pkgdir = pkgdir
+        self.logger = logger
+
+    def learn_arch_from_tree(self):
+        """
+        Attempt to figure out the arch from packages in the install tree.
+        ESX 4 and up is 64bit.
+        """
+        result = ["x86_64"]
+        return result
+
+    def get_release_files(self):
+        """
+        Find distro release packages.
+        """
+        data = glob.glob(os.path.join(self.get_pkgdir(), "*release-*"))
+        data2 = []
+        for x in data:
+            b = os.path.basename(x)
+            if b.find("vmware") != -1:
+                data2.append(x)
+        if len(data2) == 0:
+            # ESXi maybe?
+            return glob.glob(os.path.join(self.get_rootdir(), "imagedd.bz2*"))
+        return data2
+
+    def scan_pkg_filename(self, rpm):
+        """
+        Determine what the distro is based on the release package filename.
+        """
+        rpm = os.path.basename(rpm)
+
+        if rpm.lower().find("-esx-") != -1:
+            flavor = "esx"
+        elif rpm.lower() == "imagedd.bz2":
+            flavor = "esxi"
+
+        match = re.search(r'^([\-a-zA-Z0-9]+)-([\.0-9]+)-([\.0-9]+)\.', rpm)
+        if match:
+            (name, version, release) = [match.group(1), match.group(2), match.group(3)]
+            major = version.split('.')[0]
+            minor = release.split('.')[0]
+        else:
+            # FIXME: better major/minor detection for esxi
+            #        or if the match falls through for some reason
+            major = 4
+            minor = 0
+
+        return (flavor, major, minor)
+
+    def set_variance(self, flavor, major, minor, arch):
+        """
+        Set distro specific versioning.
+        """
+        os_version = "%s%s" % (flavor, major)
+        return os_version , "/var/lib/cobbler/kickstarts/default.ks"
+
+
+    def get_datestamp(self):
+        """
+        Based on a VMWare tree find the creation timestamp
+        """
+        pass
+
+#class DebianImporter ( BaseImporter ) :
+#
+#   def __init__(self,logger,rootdir,pkgdir):
+#       self.breed = "debian"
+#       self.ks = "/var/lib/cobbler/kickstarts/sample.seed"
+#       self.rootdir = rootdir
+#       self.pkgdir = pkgdir
+#       self.logger = logger
+#
+#   def get_release_files(self):
+#       if not self.get_pkgdir():
+#           return []
+#       # search for base-files or base-installer ?
+#       return glob.glob(os.path.join(self.get_pkgdir(), "main/b/base-files" , "base-files_*"))
+#
+#   def match_kernelarch_file(self, filename):
+#       if not filename.endswith("deb"):
+#           return False
+#       if filename.startswith("linux-headers-"):
+#           return True
+#       return False
+#
+#   def scan_pkg_filename(self, deb):
+#
+#       deb = os.path.basename(deb)
+#       self.logger.info("processing deb : %s" % deb)
+#
+#       # get all the tokens and try to guess a version
+#       accum = []
+#       tokens = deb.split("_")
+#       tokens2 = tokens[1].split(".")
+#       for t2 in tokens2:
+#          try:
+#              val = int(t2)
+#              accum.append(val)
+#          except:
+#              pass
+#       # Safeguard for non-guessable versions
+#       if not accum:
+#          return None
+#       accum.append(0)
+#
+#       return (None, accum[0], accum[1])
+#
+#   def set_variance(self, flavor, major, minor, arch):
+#
+#       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"
+#
+#   def set_install_tree(self, distro, url):
+#       idx = url.find("://")
+#       url = url[idx+3:]
+#
+#       idx = url.find("/")
+#       distro.ks_meta["hostname"] = url[:idx]
+#       distro.ks_meta["directory"] = url[idx:]
+#       if not distro.os_version :
+#           utils.die(self.logger, "OS version is required for debian distros")
+#       distro.ks_meta["suite"] = distro.os_version
+#
+#   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)
+
+
+#class UbuntuImporter ( DebianImporter ) :
+#
+#   def __init__(self,rootdir,pkgdir):
+#       DebianImporter.__init__(self,rootdir,pkgdir)
+#       self.breed = "ubuntu"
+#
+#   def get_release_files(self):
+#       if not self.get_pkgdir():
+#           return []
+#       return glob.glob(os.path.join(self.get_pkgdir(), "main/u/ubuntu-docs" , "ubuntu-docs_*"))
+#
+#   def set_variance(self, flavor, major, minor, arch):
+#
+#       # Release names taken from wikipedia
+#       dist_names = { '6.4':"dapper", '8.4':"hardy", '8.10':"intrepid", '9.4':"jaunty" }
+#       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"
+#
+#   def process_repos(self, main_importer, distro):
+#
+#       pass
 
=== added file 'cobbler/action_litesync.py'
--- cobbler/action_litesync.py	1970-01-01 00:00:00 +0000
+++ cobbler/action_litesync.py	2011-03-11 21:10:49 +0000
@@ -0,0 +1,167 @@
+"""
+Running small pieces of cobbler sync when certain actions are taken,
+such that we don't need a time consuming sync when adding new
+systems if nothing has changed for systems that have already 
+been created.
+
+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 os.path
+
+import utils
+import traceback
+import clogger
+import module_loader
+
+class BootLiteSync:
+    """
+    Handles conversion of internal state to the tftpboot tree layout
+    """
+
+    def __init__(self,config,verbose=False,logger=None):
+        """
+        Constructor
+        """
+        self.verbose     = verbose
+        self.config      = config
+        self.distros     = config.distros()
+        self.profiles    = config.profiles()
+        self.systems     = config.systems()
+        self.images      = config.images()
+        self.settings    = config.settings()
+        self.repos       = config.repos()
+        if logger is None:
+            logger = clogger.Logger()
+        self.logger      = logger
+        self.tftpd       = module_loader.get_module_from_file(
+                                "tftpd","module","in_tftpd"
+                                ).get_manager(config,logger)
+        self.sync        = config.api.get_sync(verbose,logger=self.logger)
+        self.sync.make_tftpboot()
+
+    def add_single_distro(self, name):
+        # get the distro record
+        distro = self.distros.find(name=name)
+        if distro is None:
+            return
+        # copy image files to images/$name in webdir & tftpboot:
+        self.sync.pxegen.copy_single_distro_files(distro,
+                                                  self.settings.webdir,True)
+        self.tftpd.add_single_distro(distro)
+
+        # generate any templates listed in the distro
+        self.sync.pxegen.write_templates(distro)
+        # cascade sync
+        kids = distro.get_children()
+        for k in kids:
+            self.add_single_profile(k.name, rebuild_menu=False)    
+        self.sync.pxegen.make_pxe_menu()
+
+
+    def add_single_image(self, name):
+        image = self.images.find(name=name)
+        self.sync.pxegen.copy_single_image_files(image)
+        kids = image.get_children()
+        for k in kids:
+            self.add_single_system(k.name)
+        self.sync.pxegen.make_pxe_menu()
+
+    def remove_single_distro(self, name):
+        bootloc = utils.tftpboot_location()
+        # delete contents of images/$name directory in webdir
+        utils.rmtree(os.path.join(self.settings.webdir, "images", name))
+        # delete contents of images/$name in tftpboot
+        utils.rmtree(os.path.join(bootloc, "images", name))
+        # delete potential symlink to tree in webdir/links
+        utils.rmfile(os.path.join(self.settings.webdir, "links", name)) 
+
+    def remove_single_image(self, name):
+        bootloc = utils.tftpboot_location()
+        utils.rmfile(os.path.join(bootloc, "images2", name))
+
+    def add_single_profile(self, name, rebuild_menu=True):
+        # get the profile object:
+        profile = self.profiles.find(name=name)
+        if profile is None:
+            # most likely a subprofile's kid has been
+            # removed already, though the object tree has
+            # not been reloaded ... and this is just noise.
+            return
+        # rebuild the yum configuration files for any attached repos
+        # generate any templates listed in the distro
+        self.sync.pxegen.write_templates(profile)
+        # cascade sync
+        kids = profile.get_children()
+        for k in kids:
+            if k.COLLECTION_TYPE == "profile":
+                self.add_single_profile(k.name, rebuild_menu=False)
+            else:
+                self.add_single_system(k.name)
+        if rebuild_menu:
+            self.sync.pxegen.make_pxe_menu()
+        return True
+         
+    def remove_single_profile(self, name, rebuild_menu=True):
+        # delete profiles/$name file in webdir
+        utils.rmfile(os.path.join(self.settings.webdir, "profiles", name))
+        # delete contents on kickstarts/$name directory in webdir
+        utils.rmtree(os.path.join(self.settings.webdir, "kickstarts", name))
+        if rebuild_menu:
+            self.sync.pxegen.make_pxe_menu()
+   
+    def update_system_netboot_status(self,name):
+        self.tftpd.update_netboot(name)
+ 
+    def add_single_system(self, name):
+        # get the system object:
+        system = self.systems.find(name=name)
+        if system is None:
+            return
+        # rebuild system_list file in webdir
+        if self.settings.manage_dhcp:
+            self.sync.dhcp.regen_ethers() 
+        if self.settings.manage_dns:
+            self.sync.dns.regen_hosts()  
+        # write the PXE files for the system
+        self.tftpd.add_single_system(system)
+
+    def remove_single_system(self, name):
+        bootloc = utils.tftpboot_location()
+        system_record = self.systems.find(name=name)
+        # delete contents of kickstarts_sys/$name in webdir
+        system_record = self.systems.find(name=name)
+
+        itanic = False
+        profile = self.profiles.find(name=system_record.profile)
+        if profile is not None:
+            distro = self.distros.find(name=profile.get_conceptual_parent().name)
+            if distro is not None and distro in [ "ia64", "IA64"]:
+                itanic = True
+
+        for (name,interface) in system_record.interfaces.iteritems():
+            filename = utils.get_config_filename(system_record,interface=name)
+
+            if not itanic:
+                utils.rmfile(os.path.join(bootloc, "pxelinux.cfg", filename))
+                utils.rmfile(os.path.join(bootloc, "grub", filename.upper()))
+            else:
+                utils.rmfile(os.path.join(bootloc, filename))
+
 
=== added file 'cobbler/action_log.py'
--- cobbler/action_log.py	1970-01-01 00:00:00 +0000
+++ cobbler/action_log.py	2011-03-11 21:10:49 +0000
@@ -0,0 +1,71 @@
+"""
+
+Copyright 2009, Red Hat, Inc
+Bill Peck <[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 sys
+import traceback
+import clogger
+
+import utils
+from cexceptions import *
+import glob
+
+class LogTool:
+    """
+    Helpers for dealing with System logs, consoles, anamon, etc..
+    """
+
+    def __init__(self,config,system,api,logger=None):
+        """
+        Log library constructor requires a cobbler system object.
+        """
+        self.system      = system
+        self.config      = config
+        self.settings    = config.settings()
+        self.api         = api
+        if logger is None:
+            logger = clogger.Logger()
+        self.logger      = logger
+
+
+    def clear(self):
+        """
+        Clears the system logs
+        """
+ 
+        #FIXME /var/consoles should come from config.settings()       
+        logs = ['/var/consoles/%s' % self.system.name]
+        anamon_dir = '/var/log/cobbler/anamon/%s' % self.system.name
+        if os.path.isdir(anamon_dir):
+            logs.extend(filter(os.path.isfile, glob.glob('%s/*' % anamon_dir)))
+        for log in logs:
+            try:
+                f = open(log, 'w')
+                f.truncate()
+                f.close()
+            except IOError, e:
+                self.logger.info("Failed to Truncate '%s':%s " % (log, e))
+            except OSError, e:
+                self.logger.info("Failed to Truncate '%s':%s " % (log, e))
+        return 0
+
 
=== added file 'cobbler/action_power.py'
--- cobbler/action_power.py	1970-01-01 00:00:00 +0000
+++ cobbler/action_power.py	2011-03-11 21:10:49 +0000
@@ -0,0 +1,150 @@
+"""
+Power management library.  For cobbler objects with power management configured
+encapsulate the logic to run power management commands so that the admin does not
+have to use seperate tools and remember how each of the power management tools are
+set up.  This makes power cycling a system for reinstallation much easier.
+
+See https://fedorahosted.org/cobbler/wiki/PowerManagement
+
+Copyright 2008-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 os.path
+import traceback
+import time
+import re
+
+import utils
+import func_utils
+from cexceptions import *
+import templar
+import clogger
+
+class PowerTool:
+    """
+    Handles conversion of internal state to the tftpboot tree layout
+    """
+
+    def __init__(self,config,system,api,force_user=None,force_pass=None,logger=None):
+        """
+        Power library constructor requires a cobbler system object.
+        """
+        self.system      = system
+        self.config      = config
+        self.settings    = config.settings()
+        self.api         = api
+        self.logger      = self.api.logger
+        self.force_user  = force_user
+        self.force_pass  = force_pass
+        if logger is None:
+            logger = clogger.Logger()
+        self.logger      = logger
+
+    def power(self, desired_state):
+        """
+        state is either "on" or "off".  Rebooting is implemented at the api.py
+        level.
+
+        The user and password need not be supplied.  If not supplied they
+        will be taken from the environment, COBBLER_POWER_USER and COBBLER_POWER_PASS.
+        If provided, these will override any other data and be used instead.  Users
+        interested in maximum security should take that route.
+        """
+
+        template = self.get_command_template()
+        template_file = open(template, "r")
+
+        meta = utils.blender(self.api, False, self.system)
+        meta["power_mode"] = desired_state
+
+        # allow command line overrides of the username/password 
+        if self.force_user is not None:
+           meta["power_user"] = self.force_user
+        if self.force_pass is not None:
+           meta["power_pass"] = self.force_pass
+
+        tmp = templar.Templar(self.api._config)
+        cmd = tmp.render(template_file, meta, None, self.system)
+        template_file.close()
+
+        cmd = cmd.strip()
+
+        self.logger.info("cobbler power configuration is:")
+
+        self.logger.info("      type   : %s" % self.system.power_type)
+        self.logger.info("      address: %s" % self.system.power_address)
+        self.logger.info("      user   : %s" % self.system.power_user)
+        self.logger.info("      id     : %s" % self.system.power_id)
+
+        # if no username/password data, check the environment
+
+        if meta.get("power_user","") == "":
+            meta["power_user"] = os.environ.get("COBBLER_POWER_USER","")
+        if meta.get("power_pass","") == "":
+            meta["power_pass"] = os.environ.get("COBBLER_POWER_PASS","")
+
+        self.logger.info("- %s" % cmd)
+
+        # use shell so we can have mutliple power commands chained together
+        cmd = ['/bin/sh','-c', cmd]