[Fai-commit] r4115 - trunk/bin

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

Author: lange
Date: 2006-10-29 15:24:37 +0100 (Sun, 29 Oct 2006)
New Revision: 4115

Modified:
   trunk/bin/make-fai-nfsroot
Log:
fix typo, test if $cfdir is already set (closes: #394884)


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-10-29 13:52:04 UTC (rev 4114)
+++ trunk/bin/make-fai-nfsroot	2006-10-29 14:24:37 UTC (rev 4115)
@@ -52,7 +52,7 @@
         v) verbose=1 ; v=-v ;;
         V) kernelname=$OPTARG ;;
         r) recover=1 ;;
-        f) die "Option -f is not supported any more. Use option -c instead" ;;
+        f) die "Option -f is not supported any more. Use option -C instead" ;;
         k) kinstall=1 ;;
         K) kremove=1; kinstall=1 ;;
         h) usage ;;
@@ -67,7 +67,7 @@
 if [ -n "$FAI_ETC_DIR" -a -z "$cfdir" ]; then
     echo "Using environment variable \$FAI_ETC_DIR."
 fi
-cfdir=${FAI_ETC_DIR:=/etc/fai}
+[ -z "$cfdir" ] && cfdir=${FAI_ETC_DIR:=/etc/fai}
 cfdir=$(readlink -f $cfdir) # canonicalize path
 if [ ! -d "$cfdir" ]; then
     echo "$cfdir is not a directory"