aboutsummaryrefslogtreecommitdiff
path: root/scripts/install-systemd-multi-user.sh
diff options
context:
space:
mode:
authorTravis A. Everett <travis.a.everett@gmail.com>2020-09-11 12:06:01 -0500
committerTravis A. Everett <travis.a.everett@gmail.com>2020-10-19 12:25:52 -0500
commitb719f686a8c8936fe831ce730f28638d8b1e2982 (patch)
treee6a0c4b094d9a6aebb60096362b5784b96d89927 /scripts/install-systemd-multi-user.sh
parent3a8699ac4ffc0d9b611c471e2668e6b22cc65767 (diff)
fix skipped multi-user install steps on macOS
Some of the changes in #3788 to support non-systemd Nix installs don't appear to be aware that the darwin installer exists, which resulted in some skipped steps and inappropriate instructions.
Diffstat (limited to 'scripts/install-systemd-multi-user.sh')
-rwxr-xr-xscripts/install-systemd-multi-user.sh45
1 files changed, 33 insertions, 12 deletions
diff --git a/scripts/install-systemd-multi-user.sh b/scripts/install-systemd-multi-user.sh
index e0201d53b..fda5ef600 100755
--- a/scripts/install-systemd-multi-user.sh
+++ b/scripts/install-systemd-multi-user.sh
@@ -72,24 +72,45 @@ poly_service_setup_note() {
EOF
}
-poly_configure_nix_daemon_service() {
- _sudo "to set up the nix-daemon service" \
- systemctl link "/nix/var/nix/profiles/default$SERVICE_SRC"
+poly_extra_try_me_commands(){
+ if [ -e /run/systemd/system ]; then
+ :
+ else
+ cat <<EOF
+ $ sudo nix-daemon
+EOF
+ fi
+}
+poly_extra_setup_instructions(){
+ if [ -e /run/systemd/system ]; then
+ :
+ else
+ cat <<EOF
+Additionally, you may want to add nix-daemon to your init-system.
- _sudo "to set up the nix-daemon socket service" \
- systemctl enable "/nix/var/nix/profiles/default$SOCKET_SRC"
+EOF
+ fi
+}
- handle_network_proxy
+poly_configure_nix_daemon_service() {
+ if [ -e /run/systemd/system ]; then
+ _sudo "to set up the nix-daemon service" \
+ systemctl link "/nix/var/nix/profiles/default$SERVICE_SRC"
+
+ _sudo "to set up the nix-daemon socket service" \
+ systemctl enable "/nix/var/nix/profiles/default$SOCKET_SRC"
- _sudo "to load the systemd unit for nix-daemon" \
- systemctl daemon-reload
+ handle_network_proxy
- _sudo "to start the nix-daemon.socket" \
- systemctl start nix-daemon.socket
+ _sudo "to load the systemd unit for nix-daemon" \
+ systemctl daemon-reload
- _sudo "to start the nix-daemon.service" \
- systemctl restart nix-daemon.service
+ _sudo "to start the nix-daemon.socket" \
+ systemctl start nix-daemon.socket
+ _sudo "to start the nix-daemon.service" \
+ systemctl restart nix-daemon.service
+ fi
}
poly_group_exists() {