[Fai-commit] r3932 - trunk/bin

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

Author: lange
Date: 2006-09-12 19:16:23 +0000 (Tue, 12 Sep 2006)
New Revision: 3932

Modified:
   trunk/bin/make-fai-nfsroot
Log:
use readlink for determine cfdir (closes: #358765)


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-09-12 15:15:12 UTC (rev 3931)
+++ trunk/bin/make-fai-nfsroot	2006-09-12 19:16:23 UTC (rev 3932)
@@ -65,6 +65,7 @@
 set -e
 
 [ -z "$cfdir" ] && cfdir=/etc/fai
+cfdir=$(readlink -f $cfdir) # canonicalize path
 if [ ! -d "$cfdir" ]; then
     echo "$cfdir is not a directory"
     exit 6
@@ -166,7 +167,6 @@
 
     # copy to nfsroot
     echo "root:$FAI_ROOTPW" | $ROOTCMD chpasswd --encrypted
-    cd $NFSROOT
     cp -Rpv $cfdir/* $NFSROOT/etc/fai
     # append additional variables to fai.conf for the install clients
     [ -z "$FAI_CONFIG_SRC" ] && echo "FAI_CONFIG_SRC=nfs://`hostname`$FAI_CONFIGDIR" >> $NFSROOT/etc/fai/fai.conf