aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-08-28 11:34:23 +0200
committerGitHub <noreply@github.com>2019-08-28 11:34:23 +0200
commitad03159e259f07da0049ba6e2b2f3d27227f2326 (patch)
tree8a0bf0eea7ff9344b3c177f51cf25da924bda223
parentbd285849ed1a902cb2d590b5124a310e8b18df8b (diff)
parentd854e7dfd6d512c8ed687b61d7aae3358eda71cd (diff)
Merge pull request #2745 from samueldr/install/detect-systemd-separately
install-multi-user: Detect and fail lack of systemd separately
-rw-r--r--scripts/install-multi-user.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh
index 3d8b035eb..a41309e93 100644
--- a/scripts/install-multi-user.sh
+++ b/scripts/install-multi-user.sh
@@ -758,9 +758,13 @@ main() {
if [ "$(uname -s)" = "Darwin" ]; then
# shellcheck source=./install-darwin-multi-user.sh
. "$EXTRACTED_NIX_PATH/install-darwin-multi-user.sh"
- elif [ "$(uname -s)" = "Linux" ] && [ -e /run/systemd/system ]; then
- # shellcheck source=./install-systemd-multi-user.sh
- . "$EXTRACTED_NIX_PATH/install-systemd-multi-user.sh"
+ elif [ "$(uname -s)" = "Linux" ]; then
+ if [ -e /run/systemd/system ]; then
+ # shellcheck source=./install-systemd-multi-user.sh
+ . "$EXTRACTED_NIX_PATH/install-systemd-multi-user.sh"
+ else
+ failure "Sorry, the multi-user installation requires systemd on Linux (detected using /run/systemd/system)"
+ fi
else
failure "Sorry, I don't know what to do on $(uname)"
fi