Skip to content

Commit ecc4729

Browse files
committed
Rename device-config -> role-config
1 parent 20bfd02 commit ecc4729

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

files/build_templates/dhcp_relay.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=DHCP relay container
33
Requires=docker.service
4-
After=device-config.service
4+
After=role-config.service
55
After=interfaces-config.service
66

77
[Service]

files/build_templates/sonic_debian_extension.j2

+4-4
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ sudo cp $IMAGE_CONFIGS/platform/platform-init.service $FILESYSTEM_ROOT/etc/syst
130130
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable platform-init.service
131131
sudo cp $IMAGE_CONFIGS/platform/platform-init.sh $FILESYSTEM_ROOT/usr/bin/
132132

133-
# Copy device-config script and service unit file, enable service
134-
sudo cp $IMAGE_CONFIGS/platform/device-config.service $FILESYSTEM_ROOT/etc/systemd/system/
135-
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable device-config.service
136-
sudo cp $IMAGE_CONFIGS/platform/device-config.sh $FILESYSTEM_ROOT/usr/bin/
133+
# Copy role-config script and service unit file, enable service
134+
sudo cp $IMAGE_CONFIGS/platform/role-config.service $FILESYSTEM_ROOT/etc/systemd/system/
135+
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable role-config.service
136+
sudo cp $IMAGE_CONFIGS/platform/role-config.sh $FILESYSTEM_ROOT/usr/bin/
137137

138138
# Copy sudoers configuration file
139139
sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/

files/build_templates/teamd.service.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=TEAMD container
33
Requires=database.service
4-
After=device-config.service
4+
After=role-config.service
55
After=database.service
66

77
[Service]
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[Unit]
2-
Description=Device-specific configuration
2+
Description=Role-specific configuration
33
After=updategraph.service
44

55
[Service]
66
Type=oneshot
7-
ExecStart=/usr/bin/device-config.sh
7+
ExecStart=/usr/bin/role-config.sh
88

99
[Install]
1010
WantedBy=multi-user.target

files/image_config/platform/device-config.sh renamed to files/image_config/platform/role-config.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
#
3-
# device-config.sh
3+
# role-config.sh
44
#
5-
# Script to perform tasks which configure device based on its role, etc.
6-
# To be run by device-config.service
5+
# Script to perform tasks which configure device based on its role as determined by its minigraph
6+
# To be run by role-config.service
77
#
88

99
# Disable DHCP relay service if device does not require it

0 commit comments

Comments
 (0)