minor fixes

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 69bbec775c598ec5e687fb35f95f4e58436aec4a..fa425421ceadf3da7d7e0314f7c5d6d4c65bf28c 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -290,9 +290,7 @@ pi trash-cli
 s lnf -T /a/bin /b
 
 if has_p; then
-    lnf -T /p/offlineimap ~/Maildir
     lnf -T /p/News ~/News
-    # don't use /* because I don't want to require it to be mounted
 fi
 
 s lnf /q/root/.editor-backups /q/root/.undo-tree-history \
@@ -590,7 +588,7 @@ if has_btrfs || home_network; then
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-for dir in /i /mnt/iroot /k /kr; do
+for dir in /i /mnt/iroot /k /kr /w; do
     if ! mountpoint $dir &>/dev/null && \
             awk '{print $2}' /etc/fstab | grep -xF $dir &>/dev/null; then
         if awk '{print $3}' /etc/fstab | grep -xF nfs &>/dev/null; then
@@ -612,6 +610,10 @@ Type=oneshot
 ExecStart=/root/imount
 
 [Install]
+# note /kr needs networking, this target is the simplest way to
+# time it when the network should be up, but not do something
+# dumb like delay startup until the network is up. It happens
+# at some time after network.target
 WantedBy=multi-user.target
 EOF
     sudo systemctl daemon-reload # needed if the file was already there