[Fai-commit] r6409 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2011-04-15 13:14:02 +0000 (Fri, 15 Apr 2011)
New Revision: 6409

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/control
Log:
use pxelinux.0 from inside the nfsroot, add depends on syslinux-common

do not install syslinux-common on install server. It's only needed
inside the nfsroot


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2011-04-15 13:13:22 UTC (rev 6408)
+++ trunk/bin/make-fai-nfsroot	2011-04-15 13:14:02 UTC (rev 6409)
@@ -429,7 +429,7 @@
 setup_dhcp(){
 
     # pxe and dhcp environment
-    local pxebin=/usr/lib/syslinux/pxelinux.0
+    local pxebin=$NFSROOT/usr/lib/syslinux/pxelinux.0
     rm -f $NFSROOT/boot/*.bak
     mkdir -p $TFTPROOT/pxelinux.cfg
     cp -pv $NFSROOT/boot/vmlinu?-* $NFSROOT/boot/initrd.img-* $TFTPROOT

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2011-04-15 13:13:22 UTC (rev 6408)
+++ trunk/debian/control	2011-04-15 13:14:02 UTC (rev 6409)
@@ -41,7 +41,7 @@
 Package: fai-server
 Architecture: all
 Depends: fai-client, debootstrap
-Recommends: nfs-kernel-server, isc-dhcp-server | dhcp3-server, tftpd-hpa | atftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, fai-setup-storage, libproc-daemon-perl
+Recommends: nfs-kernel-server, isc-dhcp-server | dhcp3-server, tftpd-hpa | atftpd, openssh-server, openssh-client, openbsd-inetd | inet-superserver, fai-setup-storage, libproc-daemon-perl
 Suggests: debmirror, reprepro, genisoimage, grub, aptitude, perl-tk
 Conflicts: fai
 Replaces: fai
@@ -73,7 +73,7 @@
 
 Package: fai-nfsroot
 Architecture: all
-Depends: fai-client, live-boot|live-initramfs, fai-setup-storage
+Depends: fai-client, live-boot|live-initramfs, fai-setup-storage, syslinux-common
 Conflicts: fai, fai-kernels
 Description: Fully Automatic Installation nfsroot package
  FAI is a non-interactive system to install, customize and manage