fix chboot, add partition options

[automated-distro-installer] / fai-wrapper

diff --git a/fai-wrapper b/fai-wrapper
index d07ea8f3fa4179c5805e32197c853b23832aba5f..45804a5a669f968cef9ae3f63fd164ec963ec8a6 100644 (file)
--- a/fai-wrapper
+++ b/fai-wrapper
@@ -15,19 +15,27 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-# for using some fai commands outside of fai
+# For using some fai commands outside of fai.
+# to set fai classes, export CLASS_CLASSNAME=true
 ifclass() {
     local var=${1/#/CLASS_}
     [[ $HOSTNAME == $1 || ${!var} ]]
 }
+fai-setclass() {
+    for class in "$@"; do
+        # export class vars with CLASS_ in front to avoid name collisions.
+        classes+=" $class"
+        export CLASS_$class=true
+    done
+    classes="${classes# }"
+    export classes
+}
+eval-fai-classfile() {
+    file=$1
+    fai-setclass $(bash -l $file)
+}
 export -f ifclass
 classes=  # used by fcopy
-for x in $(bash /a/bin/fai/fai/config/class/50-host-classes); do
-    # export class vars with CLASS_ in front to avoid name collisions.
-    classes+=" $x"
-    export CLASS_$x=true
-done
-classes="${classes# }"
-export classes
+eval-fai-classfile /a/bin/fai/fai/config/class/50-host-classes
 export FAI_ROOT=/
 export FAI=/a/bin/fai/fai/config