use latest btrfs-progs to match linux-libre

[automated-distro-installer] / myfai-chboot

diff --git a/myfai-chboot b/myfai-chboot
index 7d775ea66cd1e13663ed38df4098e6b49f518a9b..743859abcf803d65c7495a4424de204ca94adf7f 100755 (executable)
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -1,4 +1,20 @@
 #!/bin/bash
+# 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.
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
@@ -36,8 +52,10 @@ case $1 in
   -h|--help) usage ;;
 esac
 
+
+faiserver_addr=$(host faiserver | sed -rn 's/^\S+ has address //p;T;q' ||:)
 host=$(./chost faiserver)
-if [[ $host == $(./chost $HOSTNAME) ]]; then
+if ip a | grep "^ *inet.\? $faiserver_addr" &>/dev/null; then
   ./myfai-chboot-local "$@"
 else
   ssh root@$host bash -s -- "$@" <myfai-chboot-local