minor fix

diff --git a/conflink b/conflink
index 0a7e64916c8b56680a5c2e555952743cd681fff1..e6c947759154eb7f9e466acde58aeba16c068242 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -138,7 +138,7 @@ find-maybe() {
     fi
   done
   if (( ${#paths[@]} >= 1 )); then
     fi
   done
   if (( ${#paths[@]} >= 1 )); then

-    find "${paths[@]}" "$@"
+    m find "${paths[@]}" "$@"

   fi
 }
 
   fi
 }
 


@@ -205,12 +205,13 @@ case $user in
     if [[ -e /p/c ]]; then
       chmod -R g-s,u=rwX,go= /p/c
     fi
     if [[ -e /p/c ]]; then
       chmod -R g-s,u=rwX,go= /p/c
     fi

+    # setup most directories to be world readable

     find_paths=(/p/c/filesystem /p/c/machine_specific/*/filesystem /p/c/user-specific)
     find-maybe -type d \! -name wireguard \! -path '*/moddata/*' \! -name moddata -exec chmod go+rX '{}' +
 
     find_paths=(/p/c/filesystem/etc/{,hpn}ssh /p/c/machine_specific/*/filesystem/etc/ssh /p/c/machine_specific/*/filesystem/etc/hpnssh)
     find-maybe -type f \! -name '*key' -exec chmod go+rX '{}' +
     find_paths=(/p/c/filesystem /p/c/machine_specific/*/filesystem /p/c/user-specific)
     find-maybe -type d \! -name wireguard \! -path '*/moddata/*' \! -name moddata -exec chmod go+rX '{}' +
 
     find_paths=(/p/c/filesystem/etc/{,hpn}ssh /p/c/machine_specific/*/filesystem/etc/ssh /p/c/machine_specific/*/filesystem/etc/hpnssh)
     find-maybe -type f \! -name '*key' -exec chmod go+rX '{}' +

-    find_paths=(/p/c/machine_specific/*/filesystem/etc/apt)
+    find_paths=(/p/c/machine_specific/*/filesystem/etc/apt /p/c/machine_specific/*/filesystem/etc/systemd)

     find-maybe -type f -exec chmod go+rX '{}' +
 
     # note: intentionally letting a few files have more restrictive
     find-maybe -type f -exec chmod go+rX '{}' +
 
     # note: intentionally letting a few files have more restrictive

diff --git a/subdir_files/.config/konsolerc b/subdir_files/.config/konsolerc
index 2e559bb95f4080c9a0bd67234c78fad9b7ef18b4..87c09bdf6016e9b321c2458cb9751473b7bf40c6 100644 (file)
--- a/subdir_files/.config/konsolerc
+++ b/subdir_files/.config/konsolerc
@@ -23,10 +23,10 @@ ShowMenuBarByDefault=false
 2 screens: Width=1916
 2 screens: XPosition=2
 2 screens: YPosition=2
 2 screens: Width=1916
 2 screens: XPosition=2
 2 screens: YPosition=2

-3840x2160 screen: Height=2156
-3840x2160 screen: Width=1276
-3840x2160 screen: XPosition=2562
-3840x2160 screen: YPosition=2
+3840x2160 screen: Height=1076
+3840x2160 screen: Width=1393
+3840x2160 screen: XPosition=2
+3840x2160 screen: YPosition=1082

 DP-0=DP-0
 DP-1 eDP-1=DP-1
 DP-1-1 eDP-1=DP-1-1
 DP-0=DP-0
 DP-1 eDP-1=DP-1
 DP-1-1 eDP-1=DP-1-1