Include isolinux.bin, as the one shipped by Lenny breaks pdk

64studio · Oct 15, 2008 · 92df8f0 · 92df8f0
1 parent 091cdd3
commit 92df8f0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/debian/control b/debian/control
@@ -8,7 +8,7 @@ XS-Python-Version: current
 
 Package: pdk
 Architecture: all
-Depends: ${shlibs:Depends}, ${python:Depends}, git-core (>= 1.3), python-apt, python-celementtree, python-pycurl | python2.3-pycurl, python-xml, smartpm-core, python-egenix-mxtexttools, syslinux, genisoimage, rpm
+Depends: ${shlibs:Depends}, ${python:Depends}, git-core (>= 1.3), python-apt, python-celementtree, python-pycurl | python2.3-pycurl, python-xml, smartpm-core, python-egenix-mxtexttools, genisoimage, rpm
 Conflicts: picax
 Replaces: picax
 Provides: picax

diff --git a/debian/install b/debian/install
@@ -0,0 +1 @@
+isolinux.bin usr/lib/pdk
diff --git a/isolinux.bin b/isolinux.bin
diff --git a/picax/modules/debian-installer.py b/picax/modules/debian-installer.py
@@ -232,9 +232,10 @@ def _install_i386(cd_path):
  _download_di_base("%s/%s" % (base_url, inst_conf["cdrom_path"]),
  image_path, boot_image_list)
 
- if not os.path.exists("/usr/lib/syslinux/isolinux.bin"):
- raise RuntimeError, "you must have syslinux installed"
- shutil.copyfile("/usr/lib/syslinux/isolinux.bin",
+ isolinux_bin = "/usr/lib/pdk/isolinux.bin"
+ if not os.path.exists(isolinux_bin):
+ raise RuntimeError, "you must have isolinux installed"
+ shutil.copyfile(isolinux_bin,
  cd_path + "/isolinux/isolinux.bin")
 
  shutil.copyfile(image_path + "/vmlinuz",