bug fix

[automated-distro-installer] / fai-wrapper

diff --git a/fai-wrapper b/fai-wrapper
index e54e2d534b229ebb37f790362f0cfc86f83d5736..b6a75d327e339607900aa74ee7364d9b63e034e3 100644 (file)
--- 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,9 +20,12 @@
 # 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} ]]
+  [[ $HOSTNAME == "$1" || ${!var} ]]
 }
 fai-setclass() {
   for class in "$@"; do
@@ -38,10 +42,11 @@ eval-fai-classfile() {
     echo "$0: probably an error: eval-fai-classfile no such file: $file"
     return 0
   fi
-  fai-setclass $(bash -l $file)
+  fai-setclass $(bash $file)
 }
 export -f ifclass
-classes=DEFAULT  # used by fcopy
+# DEFAULT is used by fcopy
+classes="DEFAULT $(hostname)"
 export CLASS_DEFAULT=true
 if [[ ! -d $FAI_ROOT ]]; then
   export FAI_ROOT=/