From: Ian Kelling <ian@iankelling.org>
Date: Sat, 19 Oct 2019 16:15:41 +0000 (-0400)
Subject: conflink bug fix, btrbk on x3
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;ds=sidebyside;h=3f878090bcbab55fb07cca8cc840b4817c6eb7c5;p=distro-setup

conflink bug fix, btrbk on x3
---

diff --git a/btrbk-run b/btrbk-run
index 3e610de..bfb2080 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -152,6 +152,9 @@ if [[ ! -v targets && ! $source ]]; then
     x2)
       targets=($home kw)
       ;;
+    x3)
+      targets=($home)
+      ;;
     tp)
       # kd disabled temporarily while its hot and i plan to work on it.
       #targets=(frodo kd)
diff --git a/conflink b/conflink
index 42c811a..fdd3bd6 100755
--- a/conflink
+++ b/conflink
@@ -140,6 +140,13 @@ case $user in
     fi
 
     m sudo -H -u user2 "${BASH_SOURCE[0]}"
+
+    f=/a/bin/distro-setup/system-status
+    if [[ -x $f ]]; then
+      $f _
+    fi
+    echo 0 >~/.local/conflink
+
     ;;
   user2)
     m common-file-setup ${c_dirs[@]}
@@ -149,8 +156,3 @@ case $user in
     ;;
 esac
 
-f=/a/bin/distro-setup/system-status
-if [[ -x $f ]]; then
-  $f _
-fi
-echo 0 >~/.local/conflink
diff --git a/machine_specific/btrbk.hosts b/machine_specific/btrbk.hosts
index 249ba95..d2378c0 100644
--- a/machine_specific/btrbk.hosts
+++ b/machine_specific/btrbk.hosts
@@ -2,3 +2,4 @@ kd
 kw
 x2
 tp
+x3