Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

systemd units: dep cleanup #442

Merged
merged 4 commits into from
Oct 22, 2019
Merged

systemd units: dep cleanup #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ccaceb
Use BindsTo= for dependencies that *must* be up
tjkirch Oct 21, 2019
62e2c91
Remove prepare-var-lib-thar.service
tjkirch Oct 21, 2019
b23d21a
Remove network.target from apiserver.service dependencies
tjkirch Oct 21, 2019
c4e56ef
Join systemd dependency lines
tjkirch Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/kubernetes/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description=Kubelet
Documentation=https://github.com/kubernetes/kubernetes
After=containerd.service configured.target
Wants=configured.target
Requires=containerd.service
BindsTo=containerd.service

[Service]
EnvironmentFile=/etc/kubernetes/kubelet/env
Expand Down
9 changes: 0 additions & 9 deletions packages/release/prepare-var-lib-thar.service
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions packages/release/release.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Source1004: host-containerd-config.toml
Source1006: prepare-local.service
Source1007: var.mount
Source1008: opt.mount
Source1009: prepare-var-lib-thar.service
Source1010: var-lib-thar.mount

BuildArch: noarch
Expand Down Expand Up @@ -102,7 +101,7 @@ VERSION_ID=%{version}
EOF

install -d %{buildroot}%{_cross_unitdir}
install -p -m 0644 %{S:1002} %{S:1003} %{S:1006} %{S:1007} %{S:1008} %{S:1009} %{S:1010} %{buildroot}%{_cross_unitdir}
install -p -m 0644 %{S:1002} %{S:1003} %{S:1006} %{S:1007} %{S:1008} %{S:1010} %{buildroot}%{_cross_unitdir}

install -d %{buildroot}%{_cross_templatedir}
install -p -m 0644 %{S:200} %{buildroot}%{_cross_templatedir}/hostname
Expand All @@ -121,7 +120,6 @@ install -p -m 0644 %{S:200} %{buildroot}%{_cross_templatedir}/hostname
%{_cross_unitdir}/configured.target
%{_cross_unitdir}/host-containerd.service
%{_cross_unitdir}/prepare-local.service
%{_cross_unitdir}/prepare-var-lib-thar.service
%{_cross_unitdir}/var.mount
%{_cross_unitdir}/opt.mount
%{_cross_unitdir}/var-lib-thar.mount
Expand Down
3 changes: 1 addition & 2 deletions packages/release/var-lib-thar.mount
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
Description=Private Directory (/var/lib/thar)
DefaultDependencies=no
Conflicts=umount.target
RequiresMountsFor=/var
Before=local-fs.target umount.target
Wants=prepare-var-lib-thar.service
After=prepare-var-lib-thar.service

[Mount]
What=/dev/disk/by-partlabel/THAR-PRIVATE
Expand Down
4 changes: 2 additions & 2 deletions packages/workspaces/apiserver.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Unit]
Description=Thar API server
After=network.target storewolf.service migrator.service
Requires=network.target storewolf.service migrator.service
After=storewolf.service migrator.service
Requires=storewolf.service migrator.service

[Service]
Type=notify
Expand Down
2 changes: 1 addition & 1 deletion packages/workspaces/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Unit]
Description=Host container: %i
After=host-containerd.service
Requires=host-containerd.service
BindsTo=host-containerd.service

[Service]
Type=simple
Expand Down
7 changes: 3 additions & 4 deletions packages/workspaces/moondog.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[Unit]
Description=Thar userdata configuration system
After=network-online.target
After=apiserver.service
Requires=network-online.target
Requires=apiserver.service
# Need network online to talk to IMDS.
After=network-online.target apiserver.service
Requires=network-online.target apiserver.service
# We only want to run once, at first boot. This file is created by moondog
# after a successful run.
ConditionPathExists=!/var/lib/thar/moondog.ran
Expand Down
8 changes: 3 additions & 5 deletions packages/workspaces/sundog.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
[Unit]
Description=User-specified setting generators
After=network-online.target
After=apiserver.service
After=moondog.service
Requires=network-online.target
Requires=apiserver.service
# Need network access to support commands talking to IMDS.
After=network-online.target apiserver.service moondog.service
Requires=network-online.target apiserver.service

[Service]
Type=oneshot
Expand Down