matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[build][systemd] Mask disabled services by default (#4721)

Browse Source 
When building the SONiC image, used systemd to mask all services which are set to "disabled" in init_cfg.json.

This PR depends on https://github.com/Azure/sonic-utilities/pull/944, otherwise `config load_minigraph will fail when trying to restart disabled services.
This commit is contained in:
Joe LeVeque 2020-06-24 15:25:16 -07:00 committed by Abhishek Dosi
parent 0768bf7733
commit 5df5015835
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
files/build_scripts/mask_disabled_services.py Executable file
View File

@ -0,0 +1,13 @@
#!/usr/bin/env python3
import json
import subprocess
INIT_CFG_FILE_PATH = '/etc/sonic/init_cfg.json'
with open(INIT_CFG_FILE_PATH) as init_cfg_file:
init_cfg = json.load(init_cfg_file)
if 'FEATURE' in init_cfg:
for feature_name, feature_props in init_cfg['FEATURE'].items():
if 'status' in feature_props and feature_props['status'] == 'disabled':
subprocess.run(['systemctl', 'mask', '{}.service'.format(feature_name)])

7
files/build_templates/sonic_debian_extension.j2
View File

@ -27,6 +27,7 @@ set -x -e
CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64) CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
. functions.sh . functions.sh
BUILD_SCRIPTS_DIR=files/build_scripts
BUILD_TEMPLATES=files/build_templates BUILD_TEMPLATES=files/build_templates
IMAGE_CONFIGS=files/image_config IMAGE_CONFIGS=files/image_config
SCRIPTS_DIR=files/scripts SCRIPTS_DIR=files/scripts
@ -504,3 +505,9 @@ sudo chown -R $FRR_USER_UID:$FRR_USER_GID $FILESYSTEM_ROOT/etc/sonic/frr
sudo chmod -R 640 $FILESYSTEM_ROOT/etc/sonic/frr/ sudo chmod -R 640 $FILESYSTEM_ROOT/etc/sonic/frr/
sudo chmod 750 $FILESYSTEM_ROOT/etc/sonic/frr sudo chmod 750 $FILESYSTEM_ROOT/etc/sonic/frr
{%- endif %} {%- endif %}
# Mask services which are disabled by default
sudo cp $BUILD_SCRIPTS_DIR/mask_disabled_services.py $FILESYSTEM_ROOT/tmp/
sudo chmod a+x $FILESYSTEM_ROOT/tmp/mask_disabled_services.py
sudo LANG=C chroot $FILESYSTEM_ROOT /tmp/mask_disabled_services.py
sudo rm -rf $FILESYSTEM_ROOT/tmp/mask_disabled_services.py