From: Ian Kelling <ian@iankelling.org>
Date: Sun, 15 Jan 2017 17:38:03 +0000 (-0800)
Subject: improve host repo detection outside fai
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=1fe036ae3d279dbd1d60bef38dc42154507892c4;p=automated-distro-installer

improve host repo detection outside fai
---

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 278bcce..31f3f9a 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -75,13 +75,18 @@ echo "FAIBASE"
 #echo REPARTITION
 
 case $HOSTNAME in
-    frodo|treetowl)
-        if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
-            echo "STABLE_NONFREE"
+    lj|lj) echo "STABLE STABLE_LINODE" ;;
+    *)
+        if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian; then
+            if isdebian-stable; then
+                # nonfree repo is not going away any time soon due to
+                # gcc-doc being in nonfree
+                echo "STABLE_NONFREE"
+            elif isdebian-testing; then
+                echo "TESTING_NONFREE"
+            fi
         fi
         ;;
-    lj|lj)
-        echo "STABLE STABLE_LINODE" ;;
 esac
 
 if grep ^52:54:00: /sys/class/net/eth0/address &>/dev/null; then