[Fai-commit] r3401 - trunk/bin

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-04-11 22:29:27 +0000 (Tue, 11 Apr 2006)
New Revision: 3401

Modified:
   trunk/bin/make-fai-nfsroot
Log:
Print warning if -f is still used


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-04-11 22:17:20 UTC (rev 3400)
+++ trunk/bin/make-fai-nfsroot	2006-04-11 22:29:27 UTC (rev 3401)
@@ -41,7 +41,7 @@
         c) cfdir=$OPTARG ;;
         v) verbose=1 ; v=-v ;;
         r) recover=1 ;;
-        f) cfg=$OPTARG ;;
+        f) die "Option -f is not supported any more. Use option -c instead" ;;
         k) kinstall=1 ;;
         K) kremove=1; kinstall=1 ;;
 	e) expert=1 ;;
@@ -57,11 +57,7 @@
     exit 6
 fi
 [ "$verbose" ] && echo "Using configuration files from directory $cfdir"
-if [ -n "$cfg" ]; then
-    . $cfdir/$cfg
-else
-    . $cfdir/fai.conf
-fi
+. $cfdir/fai.conf
 
 # read config file for this tool
 if [ -f "$cfdir/make-fai-nfsroot.conf" ]; then