X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=d7323fdf0e9d1ee29ff4c3cf8e8d035cf752aacd;hb=b18dade73dedfe69aa741f8417947d83c4208f2d;hp=bfd4e448814e38414c9f0ced5fdedcbfbf7256e4;hpb=2b981100a8b45f117d6f5c165404937f3c917e8f;p=distro-setup

diff --git a/conflink b/conflink
index bfd4e44..d7323fd 100755
--- a/conflink
+++ b/conflink
@@ -135,6 +135,17 @@ for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
   if grep -qxF $HOSTNAME $x; then all_dirs+=( ${x%.hosts} ); fi
 done
 
+# old files 2022-03
+for t in systemstatus epanicclean btrfsmaintstop dynamicipupdate; do
+  f=/etc/systemd/system/$t.timer
+  if [[ -e $f ]]; then
+    s systemctl stop $t.timer
+    s systemctl disable $t.timer
+    s rm -fv $f
+    reload_systemd=true
+  fi
+done
+
 c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
 case $user in
   iank)