iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lots o fixes, beets, shellcheck stuff
[distro-setup]
/
keyscript-on
diff --git
a/keyscript-on
b/keyscript-on
index a2f056cc8081e281f8127649c43cce5d17f47812..8f66f7c4c8e499787d64f758c4da10f9572469a1 100755
(executable)
--- a/
keyscript-on
+++ b/
keyscript-on
@@
-2,6
+2,10
@@
# Copyright (C) 2019 Ian Kelling
# SPDX-License-Identifier: AGPL-3.0-or-later
# Copyright (C) 2019 Ian Kelling
# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# setup automatic decryption on boot using host-specific key file.
+# When changing a hostname, that key needs updating.
+
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
@@
-21,7
+25,12
@@
PATH="/sbin:$PATH"
if [[ $INVOCATION_ID ]]; then
if [[ -e /b/bash_unpublished/source-state ]]; then
if [[ $INVOCATION_ID ]]; then
if [[ -e /b/bash_unpublished/source-state ]]; then
+ # this is the canonical one
source /b/bash_unpublished/source-state
source /b/bash_unpublished/source-state
+ elif [[ -e /dev/shm/iank-status ]]; then
+ # This one gets copied by system-status and is useful because it
+ # exists when /a is unmounted.
+ source /dev/shm/iank-status
fi
if [[ $MAIL_HOST && $MAIL_HOST != $HOSTNAME ]]; then
echo "$0: exiting early: running under systemd as MAIL_HOST"
fi
if [[ $MAIL_HOST && $MAIL_HOST != $HOSTNAME ]]; then
echo "$0: exiting early: running under systemd as MAIL_HOST"