iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mail setup for exim
[distro-setup]
/
distro-begin
diff --git
a/distro-begin
b/distro-begin
index 69bbec775c598ec5e687fb35f95f4e58436aec4a..a7622848af7171f3437c9f02dcba2c3eb2ef2f1a 100755
(executable)
--- a/
distro-begin
+++ b/
distro-begin
@@
-590,7
+590,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
[[ $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
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
+612,10
@@
Type=oneshot
ExecStart=/root/imount
[Install]
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
WantedBy=multi-user.target
EOF
sudo systemctl daemon-reload # needed if the file was already there