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

diff --git a/fai-wrapper b/fai-wrapper
index e54e2d5..5efa7f1 100644
--- a/fai-wrapper
+++ b/fai-wrapper
@@ -1,24 +1,14 @@
 #!/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} ]]
@@ -38,10 +28,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=/