X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai-wrapper;h=e54e2d534b229ebb37f790362f0cfc86f83d5736;hp=c3cc4f2279f231833225a702d9c6fdb5fd09e709;hb=HEAD;hpb=7f77555b3d92709034fe41919358053c650c71e1

diff --git a/fai-wrapper b/fai-wrapper
index c3cc4f2..5efa7f1 100644
--- a/fai-wrapper
+++ b/fai-wrapper
@@ -1,42 +1,50 @@
 #!/bin/bash
-# Copyright (C) 2016 Ian Kelling
-
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Copyright (C) 2019 Ian Kelling
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
 # 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
+# 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