[Fai-commit] r4374 - in trunk: bin examples/simple/class

[lange at alioth.debian.org]

Author: lange
Date: 2007-07-04 18:15:41 +0000 (Wed, 04 Jul 2007)
New Revision: 4374

Modified:
   trunk/bin/fai
   trunk/examples/simple/class/20-hwdetect.source
Log:
export $action for 20hwdetect.source,
do not execute 20hwdetect.source during dirinstall


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2007-07-04 17:23:17 UTC (rev 4373)
+++ trunk/bin/fai	2007-07-04 18:15:41 UTC (rev 4374)
@@ -212,7 +212,7 @@
 export FAI_ETC_DIR
 
 # override FAI_ACTION later if a command line argument is given
-[ "$1" ] && action=$1
+[ "$1" ] && export action=$1
 [ "$2" ] && export FAI_ROOT=$2 # only used for dirinstall
 
 if [ X$action = Xdirinstall ]; then

Modified: trunk/examples/simple/class/20-hwdetect.source
===================================================================
--- trunk/examples/simple/class/20-hwdetect.source	2007-07-04 17:23:17 UTC (rev 4373)
+++ trunk/examples/simple/class/20-hwdetect.source	2007-07-04 18:15:41 UTC (rev 4374)
@@ -1,10 +1,12 @@
 #! /bin/bash
 
-# (c) Thomas Lange, 2002-2005, lange at informatik.uni-koeln.de
+# (c) Thomas Lange, 2002-2007, lange at informatik.uni-koeln.de
 
 # NOTE: Files named *.source will be evaluated, but their output ignored. Instead
 # the contents of $newclasses will be added to the list of defined classes.
 
+[ "$action" = "dirinstall" ] && return 0 # Do not execute when doing dirinstall
+
 echo 0 > /proc/sys/kernel/printk
 
 # load all IDE drivers