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

[Thomas Lange]

Author: lange
Date: 2010-06-22 16:29:23 +0000 (Tue, 22 Jun 2010)
New Revision: 5814

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
  copy pxelinux.0 to TFTPROOT only if it's not already existing

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-06-22 08:59:38 UTC (rev 5813)
+++ trunk/bin/make-fai-nfsroot	2010-06-22 16:29:23 UTC (rev 5814)
@@ -443,7 +443,7 @@
     rm -f $NFSROOT/boot/*.bak
     mkdir -p $TFTPROOT/pxelinux.cfg
     cp -pv $NFSROOT/boot/vmlinu?-* $NFSROOT/boot/initrd.img-* $TFTPROOT
-    [ -f $pxebin ] && cp $pxebin $TFTPROOT
+    [ -f $TFTPROOT/pxelinux.0 ] || cp $pxebin $TFTPROOT
     echo "DHCP environment prepared. If you want to use it, you have to enable the dhcpd and the tftp-hpa daemon."
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-06-22 08:59:38 UTC (rev 5813)
+++ trunk/debian/changelog	2010-06-22 16:29:23 UTC (rev 5814)
@@ -9,6 +9,7 @@
   * updatebase: remove pre-lenny code
   * make-fai-nfsroot, make-fai-nfsroot.8: add option -B, (closes: #576092)
     (thanks to Mika Prokop for the patch)
+    copy pxelinux.0 to TFTPROOT only if it's not already existing
   * disk-info: rename subroutine
   * faimond-gui: Tk::Balloon is not used atm.
   * subroutines: show rx and tx bytes for network device at the end