From: Ian Kelling <ian@iankelling.org>
Date: Tue, 28 Jan 2020 23:31:32 +0000 (-0500)
Subject: hopefully fix arbtt
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=13935a98fe81d9ce27fb4605a1ff50459cc08184;p=distro-setup

hopefully fix arbtt
---

diff --git a/distro-end b/distro-end
index b62e1ff..f391912 100755
--- a/distro-end
+++ b/distro-end
@@ -928,6 +928,12 @@ m reset-xscreensaver
 # cabal update
 # cabal install --upgrade-dependencies  --force-reinstalls arbtt
 # also, i assume syncing this between machines somehow messed up the data.
+case $codename in
+  etiona)
+    pi arbtt
+    ;;
+esac
+
 
 
 m primary-setup
@@ -1408,7 +1414,7 @@ DEVICESCAN -a -o on -S on -n standby,q $sched \
 
 ########### misc stuff
 
-case $(debian-codename) in
+case $codename in
   # needed for debootstrap scripts for fai since fai requires debian
   flidas)
     pi dnsmasq
diff --git a/mount-latest-subvol b/mount-latest-subvol
index 0a60626..bce478a 100644
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -334,7 +334,7 @@ for vol in q a o i; do
   done
   if [[ $vol == q ]]; then
     # maybe this will fail if X is not running
-    systemctl --user start arbtt ||:
+    sudo -u iank systemctl --user stop arbtt ||:
   fi
   stale_dir=/nocow/btrfs-stale
   rm -f $stale_dir/$d