minor fixes for vps

diff --git a/fai-wrapper b/fai-wrapper
index 45804a5a669f968cef9ae3f63fd164ec963ec8a6..c3cc4f2279f231833225a702d9c6fdb5fd09e709 100644 (file)
--- a/fai-wrapper
+++ b/fai-wrapper
@@ -35,7 +35,8 @@ eval-fai-classfile() {
     fai-setclass $(bash -l $file)
 }
 export -f ifclass
-classes=  # used by fcopy
+classes=DEFAULT  # used by fcopy
+export CLASS_DEFAULT=true
 eval-fai-classfile /a/bin/fai/fai/config/class/50-host-classes
 export FAI_ROOT=/
 export FAI=/a/bin/fai/fai/config

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 31f3f9a99d1ee69e9ce67f6fe3f9967dc92ed0d0..9aa05cc16d22b01a6dd0426cf43d934f1be887ca 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -63,8 +63,21 @@
 #
 if [[ -e /a/bin/fai/fai-wrapper ]]; then
     source /a/bin/distro-functions/src/identify-distros
+    if isdebian; then
+        echo "DEBIAN"
+    fi
     if isdebian-stable; then
         echo "STABLE"
+        case $HOSTNAME in
+            li|lj) echo "STABLE_LINODE" ;;
+            *)
+                # nonfree repo is not going away any time soon due to
+                # gcc-doc being in nonfree
+                echo "STABLE_NONFREE"
+                ;;
+        esac
+    elif isdebian-testing; then
+        echo "TESTING_NONFREE"
     fi
 fi
 
@@ -74,20 +87,6 @@ echo "FAIBASE"
 #echo "PARTITION_PROMPT"
 #echo REPARTITION
 
-case $HOSTNAME in
-    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
-        ;;
-esac
 
 if grep ^52:54:00: /sys/class/net/eth0/address &>/dev/null; then
     # if our eth0 mac is in the kvm range, we are a vm.

diff --git a/wrt-setup b/wrt-setup
index c04708da3276d2533e015eb81631d11f50e2b157..041630927a60204c73ecc7f8ca7920b38059a3b0 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -243,7 +243,7 @@ v cedit /etc/hosts <<EOF || dnsmasq_restart=true
 #192.168.1.7 faiserver
 192.168.1.8 tp
 72.14.176.105 li
-45.33.1.160 lj
+45.33.9.11 lj
 138.68.10.24 dopub
 # netns creation looks for next free subnet starting at 10.173, but I only
 # use one, and I would keep this one as the first created.