X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai-wrapper;h=e54e2d534b229ebb37f790362f0cfc86f83d5736;hp=d07ea8f3fa4179c5805e32197c853b23832aba5f;hb=45578de750fb07f7a7f64181e6b3b749ef727725;hpb=1a5548031efc4a1fa88ca94237eac3033cf97ef1

diff --git a/fai-wrapper b/fai-wrapper
index d07ea8f..e54e2d5 100644
--- a/fai-wrapper
+++ b/fai-wrapper
@@ -15,19 +15,45 @@
 # 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.
+# Usually this is sourced from another script. Note this has
+# paths specific to Ian's machine.
+# to set fai classes, export CLASS_CLASSNAME=true
 ifclass() {
-    local var=${1/#/CLASS_}
-    [[ $HOSTNAME == $1 || ${!var} ]]
+  local var=${1/#/CLASS_}
+  [[ $HOSTNAME == $1 || ${!var} ]]
 }
-export -f ifclass
-classes=  # used by fcopy
-for x in $(bash /a/bin/fai/fai/config/class/50-host-classes); do
+fai-setclass() {
+  for class in "$@"; do
     # export class vars with CLASS_ in front to avoid name collisions.
-    classes+=" $x"
-    export CLASS_$x=true
-done
-classes="${classes# }"
-export classes
-export FAI_ROOT=/
-export FAI=/a/bin/fai/fai/config
+    classes+=" $class"
+    export CLASS_$class=true
+  done
+  classes="${classes# }"
+  export classes
+}
+eval-fai-classfile() {
+  file=$1
+  if [[ ! -s $file ]]; then
+    echo "$0: probably an error: eval-fai-classfile no such file: $file"
+    return 0
+  fi
+  fai-setclass $(bash -l $file)
+}
+export -f ifclass
+classes=DEFAULT  # used by fcopy
+export CLASS_DEFAULT=true
+if [[ ! -d $FAI_ROOT ]]; then
+  export FAI_ROOT=/
+fi
+if [[ ! -d $FAI ]]; then
+  if [[ -d /a/bin/fai/fai/config ]]; then
+    export FAI=/a/bin/fai/fai/config
+  else
+    echo "$0: error: could not find directory to set for FAI. currently FAI=$FAI"
+    return 1
+  fi
+fi
+
+eval-fai-classfile $FAI/class/50-host-classes
+eval-fai-classfile $FAI/class/51-multi-boot