X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=9aa05cc16d22b01a6dd0426cf43d934f1be887ca;hb=a030c6b0d89340212d3c04023dcd1fe2a52d31d1;hp=31f3f9a99d1ee69e9ce67f6fe3f9967dc92ed0d0;hpb=1fe036ae3d279dbd1d60bef38dc42154507892c4;p=automated-distro-installer 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.