conflink bug fix, btrbk on x3

diff --git a/btrbk-run b/btrbk-run
index 3e610de01b7f9fe7fc1632b1c99e2172a5ced95c..bfb2080778699b17b816737170a2c7a33cf7f1eb 100644 (file)
--- 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 42c811a6437f16b9e195b1fded71eb3516826efe..fdd3bd6072e07c25d802e132f0a828abb9605230 100755 (executable)
--- 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 249ba954ca8f3a56cbc23ea38169299618c890ee..d2378c022aa301d3f9f6cf8f06d2ec1311fe9b33 100644 (file)
--- a/machine_specific/btrbk.hosts
+++ b/machine_specific/btrbk.hosts
@@ -2,3 +2,4 @@ kd
 kw
 x2
 tp
+x3