[Fai-commit] r3795 - trunk/bin

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

Author: lange
Date: 2006-08-24 17:08:18 +0000 (Thu, 24 Aug 2006)
New Revision: 3795

Modified:
   trunk/bin/fai
Log:
call task defclass when doing dirinst,
using -N and -c is forbidden


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-08-24 17:07:21 UTC (rev 3794)
+++ trunk/bin/fai	2006-08-24 17:08:18 UTC (rev 3795)
@@ -167,10 +167,15 @@
 	    renewclass=1
 	    ;;
 	-c|--classes)
+
+	    if [ $renewclass -eq 1 ]; then
+		echo "You can't use -c|--classes and -N|--new at the same time."
+		exit 9
+	    fi
 	    shift
-	    export classes=$1
+	    export cmdlineclasses=$1
 	    shift
-	    classes=${classes//,/ }
+	    cmdlineclasses=${cmdlineclasses//,/ }
 	    ;;
         --) 
             shift
@@ -224,7 +229,7 @@
 
 fai_init
 if [ X$action = Xdirinst ]; then
-    skiptask confdir defclass
+    skiptask confdir
     export FAI=$FAI_CONFIGDIR
 fi