From a030c6b0d89340212d3c04023dcd1fe2a52d31d1 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Wed, 18 Jan 2017 14:18:56 -0800
Subject: [PATCH] minor fixes for vps
---
fai-wrapper | 3 ++-
fai/config/class/50-host-classes | 27 +++++++++++++--------------
wrt-setup | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/fai-wrapper b/fai-wrapper
index 45804a5..c3cc4f2 100644
--- 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 31f3f9a..9aa05cc 100755
--- 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 c04708d..0416309 100755
--- 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.
--
2.30.2