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

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-07-20 11:32:29 +0000 (Thu, 20 Jul 2006)
New Revision: 3573

Modified:
   trunk/bin/fai-chboot
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
change path to /srv/tftp/fai/pxelinux.cfg


Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot	2006-07-19 15:45:42 UTC (rev 3572)
+++ trunk/bin/fai-chboot	2006-07-20 11:32:29 UTC (rev 3573)
@@ -28,7 +28,7 @@
 #*********************************************************************
 
 # variable needed: $nfsroot
-$version="version 2.2 14-july-2006";
+$version="version 2.2.1 20-july-2006";
 
 use Socket;
 use Net::hostent;
@@ -327,7 +327,7 @@
 
 $opt_n and $opt_v = 1;
 $opt_v and $verbose = 1;
-$pxedir = $opt_d || '/srv/tftp/pxelinux.cfg';
+$pxedir = $opt_d || '/srv/tftp/fai/pxelinux.cfg';
 $opt_L and $opt_l = 1;
 $opt_l and lsdir(@ARGV);
 ($opt_B and $opt_F) && die "ERROR: use only one option out of -B and -F\n";

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-07-19 15:45:42 UTC (rev 3572)
+++ trunk/bin/make-fai-nfsroot	2006-07-20 11:32:29 UTC (rev 3573)
@@ -385,7 +385,7 @@
     local pxebin=/usr/lib/syslinux/pxelinux.0
     cp -p $NFSROOT/boot/$kfile-$KERNELVERSION /srv/tftp/fai/$kfile-install
     [ -f $pxebin ] && cp $pxebin /srv/tftp/fai
-    [ -d /srv/tftp/pxelinux.cfg ] || mkdir -p /srv/tftp/pxelinux.cfg
+    [ -d /srv/tftp/fai/pxelinux.cfg ] || mkdir -p /srv/tftp/fai/pxelinux.cfg
     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	2006-07-19 15:45:42 UTC (rev 3572)
+++ trunk/debian/changelog	2006-07-20 11:32:29 UTC (rev 3573)
@@ -2,12 +2,12 @@
 
   * make pathes conform to FHS : (closes: #340608, #311524, #336650, #309554, #340609)
   * use /srv/tftp/fai    instead of /boot/fai
-  * use /srv/tftp/pxelinux.cfg instead of /boot/fai/pxelinux/cfg
+  * use /srv/tftp/fai/pxelinux.cfg instead of /boot/fai/pxelinux.cfg
   * use /srv/fai/config  instead of /usr/local/share/fai
   * use /srv/fai/nfsroot instead of /usr/lib/fai/nfsroot
   * create_ramdisk: call mkrw with -n
 
- -- Thomas Lange <lange at debian.org>  Tue, 11 Jul 2006 21:46:15 +0200
+ -- Thomas Lange <lange at debian.org>  Thu, 20 Jul 2006 13:32:02 +0200
 
 fai (2.10.5) unstable; urgency=high