X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=fai-wrapper;h=e54e2d534b229ebb37f790362f0cfc86f83d5736;hb=HEAD;hp=04625fd2063e4ba3fa3e5a2cfb6f8a0875652b43;hpb=e6c8a36522847eca91819ab3eb656dd824bc3e3c;p=automated-distro-installer

diff --git a/fai-wrapper b/fai-wrapper
index 04625fd..b6a75d3 100644
--- a/fai-wrapper
+++ b/fai-wrapper
@@ -1,5 +1,6 @@
 #!/bin/bash
-# Copyright (C) 2016 Ian Kelling
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -19,26 +20,45 @@
 # Usually this is sourced from another script. Note this has
 # paths specific to Ian's machine.
 # to set fai classes, export CLASS_CLASSNAME=true
+# This wrapper can be detected by using this var:
+export FAI_WRAPPER=true
+
 ifclass() {
-    local var=${1/#/CLASS_}
-    [[ $HOSTNAME == $1 || ${!var} ]]
+  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
+  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)
+  file=$1
+  if [[ ! -s $file ]]; then
+    echo "$0: probably an error: eval-fai-classfile no such file: $file"
+    return 0
+  fi
+  fai-setclass $(bash $file)
 }
 export -f ifclass
-classes=DEFAULT  # used by fcopy
+# DEFAULT is used by fcopy
+classes="DEFAULT $(hostname)"
 export CLASS_DEFAULT=true
-eval-fai-classfile /a/bin/fai/fai/config/class/50-host-classes
-export FAI_ROOT=/
-export FAI=/a/bin/fai/fai/config
+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