X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-begin;h=a0e9b0742610dd75c07e8606374e35644e8c664c;hb=8fc333f8c2d69d0792f3742d4f4351e7acb07d9e;hp=ef18bbd9020f6c5eb8f8fc1001f0f16790bc9eec;hpb=ae10fa08bb841b99b0df8e827735bef08c05f3ca;p=distro-setup

diff --git a/distro-begin b/distro-begin
index ef18bbd..a0e9b07 100755
--- a/distro-begin
+++ b/distro-begin
@@ -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
@@ -367,6 +377,14 @@ if bitfolk; then
   sudo sed -ri "/^127\./n;/[[:space:]]$HOSTNAME\$/d" /etc/hosts
 fi
 
+if isdeb && [[ $(debian-codename) == nabia ]]; then
+  sudo dd of=/etc/apt/preferences.d/aramo-jammy-missing <<'EOF'
+Package: linux-libc-dev libmysqlclient21
+Pin: release n=jammy,o=Ubuntu
+Pin-Priority: 500
+EOF
+fi
+
 # libfdk just has some patent worries.
 # https://www.gnu.org/licenses/license-list.en.html#fdk
 if isdeb && [[ $(debian-codename) == nabia ]]; then
@@ -604,7 +622,7 @@ case $HOSTNAME in
 /dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7  /d  btrfs  nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,compress=zstd,subvol=d  0 0
 EOF
     if ! mountpoint /d &>/dev/null; then
-      sudo mkdir /d
+      sudo mkdir -p /d
       if [[ -d /mnt/r7/d ]]; then
         sudo mount /d
       fi