fixes

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index f022ec3c4db1fda270cc76d5615e44bd7a12f1c9..25247dceaeda29c128307ea2d0c96fddd64a746c 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -213,7 +213,7 @@ fi
 distro=$(distro-name)
 case $distro in
   ubuntu|debian|trisquel)
-    sudo bash -c ". /a/bin/fai/fai-wrapper && /a/bin/fai/fai/config/scripts/GRUB_PC/11-iank"
+    sudo bash -c ". /a/bin/fai/fai-wrapper && /a/bin/fai/fai/config/scripts/IANK/11-iank"
     ;;
   *)
     sudo bash -c ". /a/bin/fai/fai-wrapper &&
@@ -319,13 +319,16 @@ if [[ ! -e $f ]]; then
   sudo sed -i --follow-symlinks 's/^ *hosts:.*/hosts: files dns myhostname/' $f
 fi
 case $HOSTNAME in
-  bk)
+  bk|je)
+    # je should be able to get along systemd-resolved, but ive had some odd
+    # very intermittent dns failures with spamassassin, it seems it might only
+    # be happening with systemd-resolved, so just use unbound
+    # to make it consistent with the other hosts.
     sudo sed -i --follow-symlinks 's/^ *hosts:.*/hosts: files dns myhostname/' /etc/nsswitch.conf
     soff systemd-resolved
     sudo ln -sf 127.0.0.1-resolv/stub-resolv.conf /etc/resolv.conf
     sgo unbound
-    sgo named
-    # cautious measure to make sure bind is up
+    # cautious measure to make sure resolution is working
     sleep 1
     ;;
   *)
@@ -340,6 +343,13 @@ case $HOSTNAME in
     ;;
 esac
 
+case $HOSTNAME in
+  bk)
+    sgo named
+    ;;
+esac
+
+
 f=/etc/apparmor.d/abstractions/nameservice
 if [[ -e $f ]] && ! grep -q /etc/resolved-nsswitch/nsswitch.conf $f; then
   sudo sed -i '/\/etc\/nsswitch.conf/a /etc/resolved-nsswitch/nsswitch.conf r,' $f