X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fclass%2F50-host-classes;h=6ab31dacadd5d8edb8d0754616d85d94ca48791f;hp=6f2e407979c754706c1eecbcd2b6facccdb463f6;hb=632c94b8382717f1a06b350c971b8246abbbbe61;hpb=dd9b3506bc63b26a5e58590dd615688809c6c14d diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes index 6f2e407..6ab31da 100755 --- a/fai/config/class/50-host-classes +++ b/fai/config/class/50-host-classes @@ -98,17 +98,26 @@ fi if [[ -e /a/bin/fai/fai-wrapper ]]; then source /a/bin/distro-functions/src/identify-distros - if isdebian; then - echo "DEBIAN" - tmp=$(debian-codename) - echo ${tmp^^} - # nonfree repo is not going away any time soon due to - # gcc-doc being in nonfree - echo ${tmp^^}_NONFREE + if isdeb; then + codename=$(debian-codename) + echo ${codename^^} + distro=$(distro-name) + case $distro in + debian) + echo ${distro^^} + # nonfree repo is not going away any time soon due to + # gcc-doc being in nonfree + echo ${codename^^}_NONFREE + ;; + trisquel) + # easier to stay with fai example config if we just call it ubuntu + echo UBUNTU + ;; + esac fi case $HOSTNAME in li|lj) echo "LINODE" ;; - bk) echo "NOCRYPT" ;; + bk|je) echo "NOCRYPT" ;; esac fi