iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fixes for vps
[automated-distro-installer]
/
fai
/
config
/
class
/
50-host-classes
diff --git
a/fai/config/class/50-host-classes
b/fai/config/class/50-host-classes
index 278bcce785df60383646fa068bbbd1281b26d2b7..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 [[ -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"
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
fi
fi
@@
-74,15
+87,6
@@
echo "FAIBASE"
#echo "PARTITION_PROMPT"
#echo REPARTITION
#echo "PARTITION_PROMPT"
#echo REPARTITION
-case $HOSTNAME in
- frodo|treetowl)
- if [[ -e /a/bin/fai/fai-wrapper ]] && isdebian-stable; then
- echo "STABLE_NONFREE"
- fi
- ;;
- lj|lj)
- echo "STABLE STABLE_LINODE" ;;
-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.
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.