summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MANIFEST.in1
-rw-r--r--cobbler.spec8
-rw-r--r--cobbler/action_sync.py2
-rw-r--r--menu.c32bin0 -> 26496 bytes
-rw-r--r--setup.py1
5 files changed, 9 insertions, 3 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index cf345e5..dda3c0e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -11,3 +11,4 @@ include COPYING AUTHORS README CHANGELOG NEWS
include rsync.exclude
include watcher.py
include cobblersyslogd
+include menu.c32
diff --git a/cobbler.spec b/cobbler.spec
index e09e6cd..f3df5a2 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,8 +2,8 @@
Summary: Boot server configurator
Name: cobbler
-Version: 0.4.0
-Release: 1%{?dist}
+Version: 0.4.1
+Release: 0%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPL
Group: Applications/System
@@ -102,6 +102,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/cobbler.1.gz
%dir /var/lib/cobbler
/var/lib/cobbler/elilo-3.6-ia64.efi
+/var/lib/cobbler/menu.c32
/var/www/cobbler/watcher.py*
/etc/init.d/cobblersyslogd
%dir /var/log/cobbler/syslog
@@ -110,6 +111,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 19 2007 Michael DeHaan <mdehaan@redhat.com> - 0.4.1-0
+- Bundles menu.c32 (syslinux) for those distros that don't provide it.
+
* Mon Feb 19 2007 Michael DeHaan <mdehaan@redhat.com> - 0.4.0-1
- Upstream changes (see CHANGELOG)
- Cobbler RPM now owns various directories it uses versus creating them using commands.
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index a2343f4..1cb4fc7 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -118,7 +118,7 @@ class BootSync:
newname = os.path.basename(path)
destpath = os.path.join(self.settings.tftpboot, newname)
self.copyfile(path, destpath)
- self.copyfile("/usr/lib/syslinux/menu.c32", os.path.join(self.settings.tftpboot, "menu.c32"))
+ self.copyfile("/var/lib/cobbler/menu.c32", os.path.join(self.settings.tftpboot, "menu.c32"))
def write_dhcp_file(self):
diff --git a/menu.c32 b/menu.c32
new file mode 100644
index 0000000..7912a08
--- /dev/null
+++ b/menu.c32
Binary files differ
diff --git a/setup.py b/setup.py
index fb78f8c..3ee562b 100644
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ if __name__ == "__main__":
# (docspath, ['README']),
(wwwpath, ['watcher.py']),
(cobpath, ['elilo-3.6-ia64.efi']),
+ (cobpath, ['menu.c32']),
(etcpath, ['kickstart_fc5.ks']),
(etcpath, ['kickstart_fc6.ks']),
(etcpath, ['kickstart_fc6_domU.ks']),