Skip to content

[action] [PR:25037] Reapply "We should check service enabled instead exists (#24754)" (#24794) #25123

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

Merged
mssonicbld merged 7 commits into from
Feb 1, 2026
+4 −7
Merged

[action] [PR:25037] Reapply "We should check service enabled instead exists (#24754)" (#24794) #25123

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa7f4f5
Reapply "We should check service enabled instead exists (#24754)" (#2…
mssonicbld Jan 19, 2026
89436c6
Merge branch '202511' into cherry/202511/25037
vmittal-msft Jan 22, 2026
ff084ec
Merge branch '202511' into cherry/202511/25037
vmittal-msft Jan 26, 2026
10eb487
Merge branch '202511' into cherry/202511/25037
vmittal-msft Jan 27, 2026
45e2f65
Merge branch '202511' into cherry/202511/25037
vmittal-msft Jan 29, 2026
b931197
Merge branch '202511' into cherry/202511/25037
vmittal-msft Feb 1, 2026
eba4c58
Merge branch '202511' into cherry/202511/25037
vmittal-msft Feb 1, 2026
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
11 changes: 4 additions & 7 deletions files/scripts/swss.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,15 +584,12 @@ function check_ports_present()
return 1
}

function check_service_exists()
function check_service_enabled()
{
systemctl list-units --full -all 2>/dev/null | grep -Fq $1
if [[ $? -eq 0 ]]; then
if systemctl is-enabled "$1" >/dev/null 2>&1; then
echo true
return
else
echo false
return
fi
}

Expand All @@ -601,7 +598,7 @@ function check_service_exists()
DEPENDENT=""
MULTI_INST_DEPENDENT=""

if [[ $(check_service_exists radv) == "true" ]]; then
if [[ $(check_service_enabled radv) == "true" ]]; then
DEPENDENT="$DEPENDENT radv"
fi

Expand All @@ -622,7 +619,7 @@ check_add_bgp_dependency
check_ports_present
PORTS_PRESENT=$?

if [[ $PORTS_PRESENT == 0 ]] && [[ $(check_service_exists teamd) == "true" ]]; then
if [[ $PORTS_PRESENT == 0 ]] && [[ $(check_service_enabled "teamd${DEV:+@$DEV}") == "true" ]]; then
MULTI_INST_DEPENDENT="teamd"
fi

Expand Down
Loading