fixup unison dir, auto-updates setup in separate repo

diff --git a/distro-begin b/distro-begin
index ce71c83de81bf5d4b4056ff2d36b469f3cdbfaf1..045af1a7fd4eede04b5f761970eb0ab9641e04d3 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -332,6 +332,15 @@ fi
 s lnf /q/root/.editor-backups /q/root/.undo-tree-history \
   /a/opt /a/c/.emacs.d $HOME/mw_vars /k/backup /root
 
+d=/q/p/c/machine_specific/$HOSTNAME/.unison
+if ! s test -L /root/.unison && [[ ! $(s find /root/.unison -prune -empty) ]]; then
+    mkdir -p $d
+    s chown -R $USER:$USER /root/.unison
+    mv -f /root/.unison/* $d
+fi
+s lnf -T $d /root/.unison
+
+
 rootsshsync
 
 s lnf /a/c/.inputrc /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root

diff --git a/distro-end b/distro-end
index 8d1a580f3ac2cd3f03c1a1bed2691dcb5a6d8c65..1f2c32453b7a199ef9a1e371b7ab11afbddef842 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -193,41 +193,7 @@ esac
 # /usr/share/doc/unattended-upgrades# cat README.md
 # /etc/apt/apt.conf.d/50unattended-upgrades
 if isdebian; then
-    pi unattended-upgrades
-    s dd of=/etc/apt/apt.conf.d/10periodic <<'EOF'
-# this file was mostly just comments.
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::AutocleanInterval "7";
-APT::Periodic::Unattended-Upgrade "1";
-EOF
-
-
-    { cat  <<'EOF'
-Unattended-Upgrade::Mail "root";
-Unattended-Upgrade::MailOnlyOnError "true";
-Unattended-Upgrade::Remove-Unused-Dependencies "true";
-Unattended-Upgrade::Origins-Pattern {
-# default is just upgrade main and security, not updates.
-EOF
-      if isdebian-testing; then
-          cat <<'EOF'
-# for testing, only do security updates.
-       "origin=Debian,codename=${distro_codename},label=Debian-Security";
-EOF
-      else
-          cat <<'EOF'
-# These are stable packages only getting bugfixes anyways.
-       "origin=*";
-EOF
-      fi
-      cat <<'EOF'
-};
-EOF
-    } | s dd of=/etc/apt/apt.conf.d/50unattended-upgrades
-
-
-    echo $- > /tmp/x
+    debian-setup-auto-update
 fi
 
 # cron