bug fix

[automated-distro-installer] / fai-wrapper

diff --git a/fai-wrapper b/fai-wrapper
index 4203f8069f2a92ccff14d05223b9ab2a2a29feae..b6a75d327e339607900aa74ee7364d9b63e034e3 100644 (file)
--- a/fai-wrapper
+++ b/fai-wrapper
@@ -1,6 +1,20 @@
 #!/bin/bash
-# Copyright (C) 2019 Ian Kelling
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# 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
+# 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.
 
 # For using some fai commands outside of fai.
 # Usually this is sourced from another script. Note this has
@@ -11,7 +25,7 @@ export FAI_WRAPPER=true
 
 ifclass() {
   local var=${1/#/CLASS_}
-  [[ $HOSTNAME == $1 || ${!var} ]]
+  [[ $HOSTNAME == "$1" || ${!var} ]]
 }
 fai-setclass() {
   for class in "$@"; do
@@ -28,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=/