X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=d72f98c29e775a1aa7b6bbf9c0a7689687864c3c;hb=e03e99848bc5fbc7ad527513e0aa4b0fc9c4d6fb;hp=30d868e4dae606d244bc2decb19126fda8d70799;hpb=7e4f3d0a6130b69b7f76a3ff13e510ffbeb1484b;p=distro-setup

diff --git a/conflink b/conflink
index 30d868e..d72f98c 100755
--- a/conflink
+++ b/conflink
@@ -24,7 +24,22 @@ m() {
 s() { sudo "$@"; }
 
 lnf() { /a/exe/lnf "$@"; }
-if [[ $1 == -f ]]; then
+now=$(date +%s)
+f=~/.local/conflink
+fast=false
+if [[ -e $f ]] && (( $(stat -c %Y $f) > $now - 60*60*24 )); then
+  fast=true
+fi
+if [[ $1 == -f ]]; then # f for fast
+  fast=true
+  shift
+elif
+  [[ $1 ]]; then
+  echo "error: unrecognized arguments" >&2
+  exit 0
+fi
+
+if $fast; then
   lnf() { ln -sf "$@"; }
 fi
 
@@ -62,13 +77,19 @@ subdir-link-r() {
 }
 
 
-
 common-file-setup() {
-  local dir fs x f
+  local dir fs x f systemd_reload
+  systemd_reload=false
   for dir in "$@"; do
     fs=$dir/filesystem
     if [[ -e $fs && $user =~ ^iank?$ ]]; then
+      # this could be done with rsync, something like this,
+      # but I haven't looked at the symlinks.
+      # s rsync -n -ahviSAXPH --specials --devices --chown=root:root --chmod=g-s $fs /
       # note, symlinks get resolved, not copied.
+      if s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -dz -C / | grep /etc/systemd &>/dev/null; then
+        systemd_reload=true
+      fi
       s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
     fi
 
@@ -79,6 +100,9 @@ common-file-setup() {
     (( ${#x[@]} >= 1 )) || continue
     m lnf ${x[@]} ~
   done
+  if $systemd_reload; then
+    m s systemctl daemon-reload
+  fi
 }
 
 user=$(id -un)
@@ -136,6 +160,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[@]}
@@ -144,5 +175,3 @@ case $user in
     echo "$0: error: unexpected user"; exit 1
     ;;
 esac
-
-echo 0 >~/.local/conflink