From c1c8058a554aa18763ad5fec8b4163eb636fd711 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 21 Jun 2011 19:09:44 +0000
Subject: [PATCH] integrate-distro.sh: Ongoing improvements

  - Add package syslinux
  - Add mount point /srv/nfs/boot/pxe/bin
  - Add bind mount /usr/share/syslinux
---
 scripts/integrate-distro.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index be658aeb..d02ba1c1 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -29,6 +29,7 @@ payload_pkgs="
 	mkinitrd
 	sysvinit
 	grub
+	syslinux
 	splashy
 
 	kbd
@@ -385,6 +386,7 @@ make_etc_fstab()
 	|debugfs              /sys/kernel/debug    debugfs    noauto                0 0
 	|usbfs                /proc/bus/usb        usbfs      noauto                0 0
 	|devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
+	|/usr/share/syslinux  /srv/nfs/boot/pxe/bin auto      bind                  0 0
 EOT
 }
 
@@ -653,7 +655,7 @@ cmd_install()
 		/etc/sysconfig/keyboard \
 		/etc/sysconfig/clock \
 		/etc/openldap/schema/authldap.schema \
-		/etc/bprof.secret \
+		/etc/opt/bprof/bprof.secret \
 	; do
 		install -d -m 755 `dirname $root$c`
 		cp -rp $c $root$c
@@ -698,6 +700,7 @@ cmd_install()
 	chroot $root /sbin/ldconfig
 	chroot $root /sbin/SuSEconfig
 	chroot $root /opt/jux/bin/jux-init-namespace.sh
+	install -m 755 -d $root/srv/nfs/boot/pxe/bin
 
 	for c in \
 		/etc/pam.d/* \