From: Ian Kelling <ian@iankelling.org>
Date: Mon, 23 Jan 2017 00:21:53 +0000 (-0800)
Subject: minor updates
X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=commitdiff_plain;h=f0a8c08295ff71bfc9a87231d06a5c0ecf3ec601

minor updates
---

diff --git a/btrbk-run b/btrbk-run
index 961208e..759b3a4 100755
--- a/btrbk-run
+++ b/btrbk-run
@@ -97,17 +97,16 @@ timestamp_format long-iso
 
 # only make a snapshot if things have changed
 snapshot_create onchange
-# much less snapshots because I have less space on the
-# local filesystem.
-#snapshot_preserve 2h 2d
-# for now, keeping them equal for simplicity sake
-snapshot_preserve 48h 14d 8w 24m
-snapshot_preserve_min 6h
+# I could make this different from target_preserve,
+# if one disk had less space.
+# for now, keeping them equal.
+snapshot_preserve 36h 14d 8w 24m
+snapshot_preserve_min 4h
 snapshot_dir btrbk
 
 # so, total backups = ~89
-target_preserve 48h 14d 8w 24m
-target_preserve_min 6h
+target_preserve 36h 14d 8w 24m
+target_preserve_min 4h
 
 # if something fails and it's not obvious, try doing
 # btrbk -l debug -v dryrun
diff --git a/distro-end b/distro-end
index 1e5303e..22e7326 100755
--- a/distro-end
+++ b/distro-end
@@ -681,7 +681,7 @@ esac
 
 
 case $distro in
-    debian|ubuntu) spa android-tools-adb/unstable ;;
+    debian|ubuntu) spa android-tools-adbd/unstable ;;
     arch) spa android-tools ;;
     # other distros unknown
 esac
@@ -725,7 +725,7 @@ walletnotify=curl -sI --connect-timeout 1 http://localhost:62602/walletnotify?%s
 alertnotify=curl -sI --connect-timeout 1 http://localhost:62602/alertnotify?%s
 EOF
         ;;
-    # other distros unknown
+                        # other distros unknown
 esac
 if [[ $HOSTNAME == treetowl ]]; then
     pi libsodium-dev python3-pip
@@ -1198,20 +1198,23 @@ if ! s virsh list --all --name | grep -xF win10 &>/dev/null; then
     # run "control userpasswords2", turn on automatic login.
     # note: when changing devices, I just undefine, the create the vm again.
 
-    s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \
-      --disk=/a/images/win10.qcow2,bus=virtio --vcpus 2 -r 4096 -w bridge=br0 \
-      -n win10 --import --os-variant $variant --cpu host-model-only
-
-    s virsh destroy win10
+    if [[ -e /a/images/win10.qcow2 ]]; then
+        s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \
+          --disk=/a/images/win10.qcow2,bus=virtio --vcpus 2 -r 4096 -w bridge=br0 \
+          -n win10 --import --os-variant $variant --cpu host-model-only
 
-    # this one hasn\'t had the virtio fix done yet.
-    s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \
-      --disk=/a/images/win7.qcow2 --vcpus 2 -r 4096 -w bridge=br0 \
-      -n win7 --import --os-variant win7 --cpu host-model-only
-    s virsh destroy win7
-    # had a problem with --cpu host, so trying out
-    # --cpu host-model-only
+        s virsh destroy win10
+    fi
 
+    if [[ -e /a/images/win7.qcow2 ]]; then
+        # this one hasn\'t had the virtio fix done yet.
+        s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \
+          --disk=/a/images/win7.qcow2 --vcpus 2 -r 4096 -w bridge=br0 \
+          -n win7 --import --os-variant win7 --cpu host-model-only
+        s virsh destroy win7
+        # had a problem with --cpu host, so trying out
+        # --cpu host-model-only
+    fi
 fi
 
 
diff --git a/install-btrfs-sync-tools b/install-btrfs-sync-tools
index bbf5194..e912664 100755
--- a/install-btrfs-sync-tools
+++ b/install-btrfs-sync-tools
@@ -25,7 +25,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
-cd $(dirname $(readlink -f "${BASH_SOURCE}"))
+x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
 
 
 echo install mount-latest-subvol check-subvol-stale /usr/local/bin
diff --git a/mail-setup b/mail-setup
index ffd6f8c..47d0710 100755
--- a/mail-setup
+++ b/mail-setup
@@ -136,7 +136,8 @@ EOF
     printf "[%s]:587 %s" "$domain" "${pass/@/#}" | s dd of=/etc/postfix/sasl_passwd 2>/dev/null
     s postmap hash:/etc/postfix/sasl_passwd
     s service postfix reload
-else
+
+else # exim
 
     # wording of question from dpkg-reconfigure exim4-config
     # 1. internet site; mail is sent and received directly using SMTP