diff options
-rw-r--r-- | COPYING_ELILO | 17 | ||||
-rw-r--r-- | MANIFEST.in | 2 | ||||
-rw-r--r-- | cobbler.spec | 2 | ||||
-rw-r--r-- | cobbler/action_sync.py | 4 | ||||
-rw-r--r-- | cobbler/settings.py | 3 | ||||
-rw-r--r-- | elilo-3.6-ia64.efi | bin | 0 -> 374212 bytes | |||
-rw-r--r-- | setup.py | 4 |
7 files changed, 29 insertions, 3 deletions
diff --git a/COPYING_ELILO b/COPYING_ELILO new file mode 100644 index 0000000..158fc8f --- /dev/null +++ b/COPYING_ELILO @@ -0,0 +1,17 @@ +Cobbler includes ELILO for Itanium provisioning since it is +not available in yum for non-IA64 machines of Fedora. Cobbler +deploys elilo.efi over TFTP to enable network booting of +Itanium machines. + +ELILO is GPL and is being distributed in binary form +persuant to this section of the GPL license: + + 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.) + +Source code to ELILO is available on http://sourceforge.net/projects/elilo. + +A full copy of the GPL is available in "COPYING". diff --git a/MANIFEST.in b/MANIFEST.in index 7b7eac6..20273d4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,5 @@ +include COPYING_ELILO +include elilo-3.6-ia64.efi include dhcp.template include cobbler.1.gz include COPYING AUTHORS README CHANGELOG NEWS diff --git a/cobbler.spec b/cobbler.spec index 3a27e14..4b1dd92 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -45,6 +45,8 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/cobbler/*.py* %{python_sitelib}/cobbler/yaml/*.py* %{_mandir}/man1/cobbler.1.gz +%dir /var/lib/cobbler +/var/lib/cobbler/elilo-3.6-ia64.efi %doc AUTHORS CHANGELOG NEWS README COPYING diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index b7240f0..40a8135 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -69,7 +69,9 @@ class BootSync: """ for loader in self.settings.bootloaders.keys(): path = self.settings.bootloaders[loader] - self.copy(path, os.path.join(self.settings.tftpboot, loader)) + newname = os.path.basename(path) + destpath = os.path.join(self.settings.tftpboot, newname) + self.copy(path, destpath) def configure_httpd(self): """ diff --git a/cobbler/settings.py b/cobbler/settings.py index e582d0a..d5a1831 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -45,7 +45,8 @@ class Settings(serializable.Serializable): "webdir" : "/var/www/cobbler", "manage_dhcp" : 0, "bootloaders" : { - "standard" : "/usr/lib/syslinux/pxelinux.0" + "standard" : "/usr/lib/syslinux/pxelinux.0", + "ia64" : "/var/lib/cobbler/elilo-3.6-ia64.efi" } } diff --git a/elilo-3.6-ia64.efi b/elilo-3.6-ia64.efi Binary files differnew file mode 100644 index 0000000..3880d59 --- /dev/null +++ b/elilo-3.6-ia64.efi @@ -14,6 +14,7 @@ Cobbler is a command line tool for simplified configuration of boot/provisioning if __name__ == "__main__": # docspath="share/doc/koan-%s/" % VERSION manpath="share/man/man1/" + cobpath="/var/lib/cobbler/" etcpath="/etc/cobbler/" setup( name="cobbler", @@ -26,7 +27,8 @@ if __name__ == "__main__": scripts = ["cobbler/cobbler"], data_files = [ # (docspath, ['README']), - (etcpath, ['dhcp.template']), + (cobpath, ['elilo-3.6-ia64.efi']), + (etcpath, ['dhcp.template']), (manpath, ['cobbler.1.gz']) ], description = SHORT_DESC, |