Skip to content

Commit dff73c6

Browse files
authored
chore: [NODE-1488] Fixup services (#1837)
1 parent 944b8d0 commit dff73c6

File tree

20 files changed

+19
-95
lines changed

20 files changed

+19
-95
lines changed

ic-os/components/boundary-guestos/etc/systemd/system/node_exporter.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Unit]
22
Description=Node Exporter
3-
After=syslog.target network.target
3+
After=network.target
44

55
[Service]
66
User=node_exporter

ic-os/components/boundary-guestos/etc/systemd/system/setup-hostname.service

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[Unit]
22
Description=Set up hostname
3-
Before=systemd-networkd.target
43
DefaultDependencies=no
54
After=bootstrap-ic-node.service
65
Before=systemd-networkd.service

ic-os/components/early-boot/setup-hostname/hostos/setup-hostname.service

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[Unit]
22
Description=Set up hostname
3-
Before=systemd-networkd.target
43
DefaultDependencies=no
54
Before=systemd-networkd.service
65
After=systemd-tmpfiles-setup.service

ic-os/components/early-boot/setup-hostname/setup-hostname.service

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
[Unit]
22
Description=Set up hostname
3-
Before=systemd-networkd.target
3+
Before=systemd-networkd.service
44
DefaultDependencies=no
55
After=bootstrap-ic-node.service
6-
Before=systemd-networkd.service
76

87
[Install]
98
WantedBy=multi-user.target

ic-os/components/guestos.bzl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ component_files = {
3838
Label("ic/ic.json5.template"): "/opt/ic/share/ic.json5.template",
3939

4040
# init
41-
Label("init/bootstrap-ic-node/guestos/bootstrap-ic-node.sh"): "/opt/ic/bin/bootstrap-ic-node.sh",
42-
Label("init/bootstrap-ic-node/guestos/bootstrap-ic-node.service"): "/etc/systemd/system/bootstrap-ic-node.service",
43-
Label("init/setup-encryption/guestos/setup-encryption.sh"): "/opt/ic/bin/setup-encryption.sh",
44-
Label("init/setup-encryption/guestos/setup-encryption.service"): "/etc/systemd/system/setup-encryption.service",
45-
Label("init/setup-encryption/guestos/setup-var-encryption.sh"): "/opt/ic/bin/setup-var-encryption.sh",
41+
Label("init/bootstrap-ic-node/bootstrap-ic-node.sh"): "/opt/ic/bin/bootstrap-ic-node.sh",
42+
Label("init/bootstrap-ic-node/bootstrap-ic-node.service"): "/etc/systemd/system/bootstrap-ic-node.service",
43+
Label("init/setup-encryption/setup-encryption.sh"): "/opt/ic/bin/setup-encryption.sh",
44+
Label("init/setup-encryption/setup-encryption.service"): "/etc/systemd/system/setup-encryption.service",
45+
Label("init/setup-encryption/setup-var-encryption.sh"): "/opt/ic/bin/setup-var-encryption.sh",
4646
Label("init/setup-lvs/setup-lvs.service"): "/etc/systemd/system/setup-lvs.service",
4747
Label("init/setup-lvs/guestos/setup-lvs.sh"): "/opt/ic/bin/setup-lvs.sh",
4848

4949
# misc
5050
Label("misc/logging.sh"): "/opt/ic/bin/logging.sh",
5151
Label("misc/metrics.sh"): "/opt/ic/bin/metrics.sh",
52-
Label("misc/serial-getty@/guestos/serial-getty@.service"): "/etc/systemd/system/serial-getty@.service",
52+
Label("misc/serial-getty@/guestos/override.conf"): "/etc/systemd/system/serial-getty@.service.d/override.conf",
5353
Label("misc/chrony/chrony.conf"): "/etc/chrony/chrony.conf",
5454
Label("misc/chrony/chrony-var.service"): "/etc/systemd/system/chrony-var.service",
5555
Label("misc/vsock/10-vhost-vsock.rules"): "/etc/udev/rules.d/10-vhost-vsock.rules",
@@ -88,7 +88,7 @@ component_files = {
8888

8989
# networking
9090
Label("networking/generate-network-config/guestos/generate-network-config.service"): "/etc/systemd/system/generate-network-config.service",
91-
Label("networking/retry-ipv6-config/guestos/retry-ipv6-config.sh"): "/opt/ic/bin/retry-ipv6-config.sh",
91+
Label("networking/retry-ipv6-config/retry-ipv6-config.sh"): "/opt/ic/bin/retry-ipv6-config.sh",
9292
Label("networking/retry-ipv6-config/retry-ipv6-config.service"): "/etc/systemd/system/retry-ipv6-config.service",
9393
Label("networking/nftables/reload_nftables.path"): "/etc/systemd/system/reload_nftables.path",
9494
Label("networking/nftables/reload_nftables.service"): "/etc/systemd/system/reload_nftables.service",

0 commit comments

Comments
 (0)