fixes for second bind host

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 570d077ca68d1fc9f5bdbb666962de4e83506bdb..783c6cebab6c90c46a95fab76bb611a416a92636 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -80,14 +80,14 @@ source $script_dir/pkgs
 set +x
 source /a/bin/distro-functions/src/identify-distros
 $interactive || set -x
-for f in kd x2 x3 frodo tp li lj demohost kw; do
+for f in kd x2 x3 frodo tp li l2 demohost kw; do
   eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
 codename=$(debian-codename)
 has_wayland() { has_monitor && [[ $codename == buster ]]; }
 has_x() { has_monitor && [[ $codename != buster ]]; }
 has_monitor() { ! linode ; }
-linode() { lj || li; }
+linode() { l2 || li; }
 # linode actually has btrfs now, but we dont do anything with it.
 has_btrfs() { ! linode; }
 home_network() { ! linode && ! kw; }
@@ -217,9 +217,9 @@ EOF
 done
 
 ###### do conflink
-# li needs the bind group before conflink
-if [[ $HOSTNAME == li ]]; then
-  getent group bind &>/dev/null || sudo groupadd -r bind
+# linode needs bind group before conflink
+if $linode; then
+  pi-nostart bind9
 fi
 # this needs to be before installing pacserve so we have gpg conf.
 conflink