[Fai-commit] r3557 - in trunk: bin conf debian doc doc/entities examples/etc examples/simple/files/etc/default/tftpd-hpa examples/simple/files/etc/fai/fai.conf lib man utils

fai-commit at lists.alioth.debian.org fai-commit at lists.alioth.debian.org
Tue Jul 11 19:48:14 UTC 2006


Author: lange
Date: 2006-07-11 19:48:12 +0000 (Tue, 11 Jul 2006)
New Revision: 3557

Modified:
   trunk/bin/fai-chboot
   trunk/bin/fai-setup
   trunk/bin/make-fai-nfsroot
   trunk/conf/fai.conf
   trunk/debian/changelog
   trunk/debian/fai-server.dirs
   trunk/debian/fai-server.postrm
   trunk/doc/entities/faisetup.sgml
   trunk/doc/fai-guide.sgml
   trunk/examples/etc/bootptab
   trunk/examples/simple/files/etc/default/tftpd-hpa/FAISERVER
   trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER
   trunk/lib/subroutines-linux
   trunk/man/fai-chboot.8
   trunk/man/make-fai-nfsroot.8
   trunk/utils/create-nfsroot-tar
   trunk/utils/tlink
Log:
new path for /boot/fai and /boot/fai/pxelinux.cfg


Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/bin/fai-chboot	2006-07-11 19:48:12 UTC (rev 3557)
@@ -327,7 +327,7 @@
 
 $opt_n and $opt_v = 1;
 $opt_v and $verbose = 1;
-$pxedir = $opt_d || '/boot/fai/pxelinux.cfg';
+$pxedir = $opt_d || '/srv/tftp/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/fai-setup
===================================================================
--- trunk/bin/fai-setup	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/bin/fai-setup	2006-07-11 19:48:12 UTC (rev 3557)
@@ -139,7 +139,7 @@
 if [ -n "$LOGUSER" ]; then
     # chown only if cd was successful
     cd $loguserhome && chown -R $LOGUSER:$logusergid .
-    chown -R $LOGUSER:$logusergid /boot/fai
+    chown -R $LOGUSER:$logusergid /srv/tftp/fai
 fi
 
 if [ -z "$FAI_CONFIGDIR" ]; then

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/bin/make-fai-nfsroot	2006-07-11 19:48:12 UTC (rev 3557)
@@ -363,7 +363,7 @@
 setup_bootp(){
 
     if [ -x "`which mkelf-linux`" ]; then
-	mkelf-linux --ip=any --output=/boot/fai/installimage \
+	mkelf-linux --ip=any --output=/srv/tftp/fai/installimage \
 	  $NFSROOT/boot/$kfile-$KERNELVERSION 
     else
         echo "Command mkelf-linux not found. Can not set up BOOTP booting. Please install the package mknbi and rerun fai-setup."
@@ -373,7 +373,7 @@
     # imggen is free software from 3com - use ver1.00: 1.01 produces "Image too Big" errors.
     # it converts netboot images to images which are bootable by 3com network cards
     if [ -x "`which imggen`" ]; then
-	imggen -a /boot/fai/installimage /boot/fai/installimage_3com
+	imggen -a /srv/tftp/fai/installimage /srv/tftp/fai/installimage_3com
     fi
     echo "BOOTP environment prepared."
 }
@@ -383,9 +383,9 @@
 
     # pxe and dhcp environment
     local pxebin=/usr/lib/syslinux/pxelinux.0
-    cp -p $NFSROOT/boot/$kfile-$KERNELVERSION /boot/fai/$kfile-install
-    [ -f $pxebin ] && cp $pxebin /boot/fai
-    [ -d /boot/fai/pxelinux.cfg ] || mkdir -p /boot/fai/pxelinux.cfg
+    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
     echo "DHCP environment prepared. If you want to use it, you have to enable the dhcpd and the tftp-hpa daemon."
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -423,7 +423,7 @@
 else
     merror="with errors"
     echo "Error. Kernel package $KERNELPACKAGE not found."
-    echo "No install kernel installed in /boot/fai."
+    echo "No install kernel installed in /srv/tftp/fai."
     echo "No kernel modules available in nfsroot."
 fi
 }

Modified: trunk/conf/fai.conf
===================================================================
--- trunk/conf/fai.conf	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/conf/fai.conf	2006-07-11 19:48:12 UTC (rev 3557)
@@ -23,9 +23,9 @@
 # and which can change the kernel that is booted via network.
 # Configure .rhosts for this account and PAM, so that root can log in
 # from all install clients without password. This account should have
-# write permissions for /boot/fai. For example, you can use write
-# permissions for the group linuxadm. chgrp linuxadm /boot/fai;chmod
-# g+w /boot/fai. If the variable is undefined, this feature is disabled.
+# write permissions for /srv/tftp/fai. For example, you can use write
+# permissions for the group linuxadm. chgrp linuxadm /srv/tftp/fai;chmod
+# g+w /srv/tftp/fai. If the variable is undefined, this feature is disabled.
 # Define it, to enable it, eg. LOGUSER=fai
 LOGUSER=
 # use ssh or rsh for copying log files to user fai and for logging in

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/debian/changelog	2006-07-11 19:48:12 UTC (rev 3557)
@@ -1,3 +1,11 @@
+fai (3beta) unstable; urgency=low
+
+  * make pathes conform to FHS : (closes: #340608, #311524, #309554)
+  * use /srv/tftp/fai instead of /boot/fai
+  * use /srv/tftp/pxelinux.cfg instead of /boot/fai/pxelinux/cfg
+
+ -- Thomas Lange <lange at debian.org>  Tue, 11 Jul 2006 21:46:15 +0200
+
 fai (2.10.5) unstable; urgency=high
 
   * fixes patch from last NMUs. (really, really closes: #373955)

Modified: trunk/debian/fai-server.dirs
===================================================================
--- trunk/debian/fai-server.dirs	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/debian/fai-server.dirs	2006-07-11 19:48:12 UTC (rev 3557)
@@ -2,4 +2,4 @@
 etc/fai
 usr/bin
 usr/sbin
-boot/fai
+srv/tftp/fai

Modified: trunk/debian/fai-server.postrm
===================================================================
--- trunk/debian/fai-server.postrm	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/debian/fai-server.postrm	2006-07-11 19:48:12 UTC (rev 3557)
@@ -7,7 +7,7 @@
 
 case "$1" in
     purge)
-        rm -rf /boot/fai /var/run/fai  
+        rm -rf /srv/tftp/fai /var/run/fai  
         ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;;

Modified: trunk/doc/entities/faisetup.sgml
===================================================================
--- trunk/doc/entities/faisetup.sgml	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/doc/entities/faisetup.sgml	2006-07-11 19:48:12 UTC (rev 3557)
@@ -45,8 +45,8 @@
   -i,	Show information on an image
   -h,	Help screen
 
-In filename: /boot/fai/installimage
-Out filename: /boot/fai/installimage_3com
+In filename: /srv/tftp/fai/installimage
+Out filename: /srv/tftp/fai/installimage_3com
 Adding MBA support...
 MBA support has been succesfully added 
 BOOTP environment prepared.

Modified: trunk/doc/fai-guide.sgml
===================================================================
--- trunk/doc/fai-guide.sgml	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/doc/fai-guide.sgml	2006-07-11 19:48:12 UTC (rev 3557)
@@ -521,7 +521,7 @@
 files of all install clients are saved to the home directory of this
 account. If you boot from network card, you should change the primary
 group of this account, so this account has write permissions to
-<file>/boot/fai</file> in order to change the symbolic links to the kernel
+<file>/srv/tftp/fai</file> in order to change the symbolic links to the kernel
 image which is booted by a client.
 
 
@@ -592,7 +592,7 @@
 
 When using BOOTP, you have to make a
 symbolic link from the hostname of your client to the appropriate
-kernel image in <file>/boot/fai</file>. You can also use the utility
+kernel image in <file>/srv/tftp/fai</file>. You can also use the utility
 <prgn>tlink</prgn> (<file>/usr/share/doc/fai/examples/utils/tlink</file>) to create
 this link. The file
 <file>installimage_3com</file> is created by <prgn>imggen</prgn> and
@@ -624,12 +624,12 @@
 Then enable the special tftp daemon
 using this line in file <file>/etc/inetd.conf</file>: 
 <example>
-tftp dgram udp wait root /usr/sbin/in.tftpd in.tftpd -s /boot/fai
+tftp dgram udp wait root /usr/sbin/in.tftpd in.tftpd -s /srv/tftp/fai
 </example>
 
 The install client then loads the pxelinux boot loader which receives
 its configuration via TFTP from a file in the directory
-<file>/boot/fai/pxelinux.cfg</file>. Using the command <manref
+<file>/srv/tftp/pxelinux.cfg</file>. Using the command <manref
 name="fai-chboot" section="8"> you can 
 define which kernel will be loaded by the PXE Linux loader and
 which additional parameters are passed to this kernel. You should
@@ -639,7 +639,7 @@
 information about how to boot such an environment. The PXE
 environment uses the original kernel image (not the netboot image made
 by mknbi-linux) which is copied to
-<file>/boot/fai/vmlinuz-install</file>.
+<file>/srv/tftp/fai/vmlinuz-install</file>.
 
 
 <sect id="bootfloppy">Creating a boot floppy
@@ -736,7 +736,7 @@
 
 .faiglobal:\
  :ms=1024:\
- :hd=/boot/fai:\
+ :hd=/srv/tftp/fai:\
  :hn:bs=auto:\
  :rp=/usr/lib/fai/nfsroot:
 
@@ -2395,7 +2395,7 @@
 symlinks for booting via network card, so change the group and add
 some utilities.
 
-<example># chgrp -R linuxadmin /boot/fai; chmod -R g+rwx /boot/fai
+<example># chgrp -R linuxadmin /srv/tftp/fai; chmod -R g+rwx /srv/tftp/fai
 # cp /usr/share/doc/fai/examples/utils/* /usr/local/bin
 </example>
 

Modified: trunk/examples/etc/bootptab
===================================================================
--- trunk/examples/etc/bootptab	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/examples/etc/bootptab	2006-07-11 19:48:12 UTC (rev 3557)
@@ -3,9 +3,9 @@
 
 .faiglobal:\
 	:ms=1024:\
-	:hd=/boot/fai:\
+	:hd=/srv/tftp/fai:\
 	:hn:bs=auto:\
-	:rp=/usr/lib/fai/nfsroot:
+	:rp=/srv/fai/nfsroot:
 
 # rp: the nfsroot on the install server
 # your local values

Modified: trunk/examples/simple/files/etc/default/tftpd-hpa/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/default/tftpd-hpa/FAISERVER	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/examples/simple/files/etc/default/tftpd-hpa/FAISERVER	2006-07-11 19:48:12 UTC (rev 3557)
@@ -1,3 +1,3 @@
 #Defaults for tftpd-hpa
 RUN_DAEMON="yes"
-OPTIONS="-l -s /boot/fai"
+OPTIONS="-l -s /srv/tftp"

Modified: trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER	2006-07-11 19:48:12 UTC (rev 3557)
@@ -23,9 +23,9 @@
 # and which can change the kernel that is booted via network.
 # Configure .rhosts for this account and PAM, so that root can log in
 # from all install clients without password. This account should have
-# write permissions for /boot/fai. For example, you can use write
-# permissions for the group linuxadm. chgrp linuxadm /boot/fai;chmod
-# g+w /boot/fai. If the variable is undefined, this feature is disabled.
+# write permissions for /srv/tftp/fai. For example, you can use write
+# permissions for the group linuxadm. chgrp linuxadm /srv/tftp/fai;chmod
+# g+w /srv/tftp/fai. If the variable is undefined, this feature is disabled.
 # Define it, to enable it, eg. LOGUSER=fai
 LOGUSER=fai
 # use ssh or rsh for copying log files to user fai and for logging in

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/lib/subroutines-linux	2006-07-11 19:48:12 UTC (rev 3557)
@@ -192,7 +192,7 @@
     if dmesg | grep -q "Sending BOOTP requests"; then
         # change boot device (local disk or network) when using bootp
 	[ "$LOGUSER" -a "$TFTPLINK" ] &&
-	    $frsh "cd /boot/fai; rm -f $hostname; ln -s $TFTPLINK $hostname"
+	    $frsh "cd /srv/tftp/fai; rm -f $hostname; ln -s $TFTPLINK $hostname"
     else
         # change boot device (local disk or network) when using PXE
         # first test if rsh to server works

Modified: trunk/man/fai-chboot.8
===================================================================
--- trunk/man/fai-chboot.8	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/man/fai-chboot.8	2006-07-11 19:48:12 UTC (rev 3557)
@@ -45,7 +45,7 @@
 .TP
 .BI "\-d " DIR
 Set the default directory for the network boot configuration to
-DIR. The default value is /boot/fai/pxelinux.cfg/.
+DIR. The default value is /srv/tftp/pxelinux.cfg/.
 .TP
 .B \-e
 Reenable network booting for HOST. This renames the config file and removes
@@ -133,7 +133,7 @@
 .TP
 fai-chboot memtest86+ koeln atom02
 The host atom02 will boot the memory test. Install the package
-memtest86+ and copy the executable memtest86+.bin to /boot/fai. Since
+memtest86+ and copy the executable memtest86+.bin to /srv/tftp/fai. Since
 memtest does not need a root filesystem, you can use any string for it.
 .TP
 fai-chboot -o default

Modified: trunk/man/make-fai-nfsroot.8
===================================================================
--- trunk/man/make-fai-nfsroot.8	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/man/make-fai-nfsroot.8	2006-07-11 19:48:12 UTC (rev 3557)
@@ -48,7 +48,7 @@
 .TP
 .B \-k
 Install a new kernel from $KERNELPACKAGE into the nfsroot and resetup
-BOOTP and DHCP environments in /boot/fai.
+BOOTP and DHCP environments in /srv/tftp/fai.
 .TP
 .B \-v
 Create verbose output on stdout.

Modified: trunk/utils/create-nfsroot-tar
===================================================================
--- trunk/utils/create-nfsroot-tar	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/utils/create-nfsroot-tar	2006-07-11 19:48:12 UTC (rev 3557)
@@ -13,5 +13,5 @@
 nfsroot=/usr/lib/fai/nfsroot
 
 cd /
-tar -cvf - $nfsroot /boot/fai /usr/local/share/fai | bzip2 > $tarball
+tar -cvf - $nfsroot /srv/tftp/fai /srv/fai/config | bzip2 > $tarball
 echo $tarball created.

Modified: trunk/utils/tlink
===================================================================
--- trunk/utils/tlink	2006-07-11 18:25:36 UTC (rev 3556)
+++ trunk/utils/tlink	2006-07-11 19:48:12 UTC (rev 3557)
@@ -2,7 +2,7 @@
 
 # (c) 2001-2002, Thomas Lange
 #
-# set link for tftpboot in /boot/fai to an image for a host
+# set link for tftpboot in /srv/tftp/fai to an image for a host
 # or for all hosts with prefix and a number
 
 # examples:
@@ -11,7 +11,7 @@
 # tlink installimage all ant
 # tlink nodeimage all ant
 #
-# tlink             shows all file in /boot/fai
+# tlink             shows all file in /srv/tftp/fai
 # tlink ant01       shows syslink for ant01
 
 version="Version 1.1 10-jan-2002"
@@ -24,7 +24,7 @@
 host=$2
 prefix=$3
 
-tftpdir=/boot/fai
+tftpdir=/srv/tftp/fai
 # - - - - - - - - - - - - - - - - - - - -
 usage() {
 
@@ -38,7 +38,7 @@
 The list of all hosts is specified in the script itself.
 
 Examples:
-    tlink                             shows all files in /boot/fai
+    tlink                             shows all files in /srv/tftp/fai
     tlink atom02                      shows symlink of host atom02
     tlink atom_install atom02         host atom02 will boot image atom_install
     tlink atom_local atom02           host atom02 will boot image atom_local




More information about the Fai-commit mailing list