Update systemd services to use ConditionHost=
#117
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This will be removed later on, so the script below is not added here.
$ ls -l --full-time /sbin/startup-hostname
lrwxrwxrwx 1 root root 26 2014-03-17 11:22:30.000000000 +0100 /sbin/startup-hostname -> /usr/sbin/startup-hostname
$ ls -l --full-time /usr/sbin/startup-hostname
-rwxr-xr-x 1 root root 547 2014-05-28 16:04:49.000000000 +0200 /usr/sbin/startup-hostname
$ more /usr/sbin/startup-hostname
#! /bin/sh
# This is a workaround for our systemd version not having ConditionHost=
# This little helper is called by startup-hostname.service and creates
# /node/startup-hostname/HOSTNAME
# So other services can use
# Wants=startup-hostname.service
# After=startup-hostname.service
# ConditionPathExists=/node/startup-hostname/HOSTNAME
# to start a unit only on a specific host
#
hostname=`uname -n`;hostname=${hostname%%.*}
mkdir -p /node/startup-hostname
rm /node/startup-hostname/* 2>/dev/null
touch /node/startup-hostname/$hostname
Make sure, the file has been actually created.
pmenzel
force-pushed
the
update-systemd-services-to-use-conditionhost
branch
from
2ea5bbc
to
a340271
Compare
|
Very good. Let me do some testing the next days. |
`ConditionHost=` was added in systemd 189, so let’s use it, now that we
are not running systemd 27 anymore.
$ more /usr/sbin/startup-hostname
[…]
# This is a workaround for our systemd version not having ConditionHost=
# This little helper is called by startup-hostname.service and creates
# /node/startup-hostname/HOSTNAME
# So other services can use
# Wants=startup-hostname.service
# After=startup-hostname.service
# ConditionPathExists=/node/startup-hostname/HOSTNAME
# to start a unit only on a specific host
#
[…]
pmenzel
force-pushed
the
update-systemd-services-to-use-conditionhost
branch
from
a340271
to
e497beb
Compare
|
Tested on a wtf clone. |
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tested by rebooting hypnotoad.
After deployment, the
systemctl daemon-reloadshould be issued, and{/usr}/sbin/startup-hostnamebe removed on the distmaster.