Skip to content

Commit 0097520

Browse files
nazar-garmadiyMaksym Hedeon
authored and
Maksym Hedeon
committed
Merge pull request sonic-net#2 from githedgehog/dev_base_img_202111_DEV-225_features_are_enabled_in_the_build_radius
Enable RADIUS flag
1 parent 8e4942e commit 0097520

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

files/build_templates/sonic_debian_extension.j2

+2
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/audisp-tacplus_*.deb || \
280280
sudo LANG=C chroot $FILESYSTEM_ROOT pam-auth-update --remove tacplus
281281
sudo sed -i -e '/^passwd/s/ tacplus//' $FILESYSTEM_ROOT/etc/nsswitch.conf
282282

283+
{% if include_radius == "y" %}
283284
# Install pam-radius-auth and nss-radius
284285
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libpam-radius-auth_*.deb || \
285286
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
@@ -289,6 +290,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/libnss-radius_*.deb || \
289290
# radius does not have any profiles
290291
#sudo LANG=C chroot $FILESYSTEM_ROOT pam-auth-update --remove radius tacplus
291292
sudo sed -i -e '/^passwd/s/ radius//' $FILESYSTEM_ROOT/etc/nsswitch.conf
293+
{% endif %}
292294

293295
# Install a custom version of kdump-tools (and its dependencies via 'apt-get -y install -f')
294296
if [[ $CONFIGURED_ARCH == amd64 ]]; then

rules/config

+3
Original file line numberDiff line numberDiff line change
@@ -222,3 +222,6 @@ INCLUDE_MUX = y
222222

223223
# reset default container registry from dockerhub to other
224224
DEFAULT_CONTAINER_REGISTRY ?=
225+
226+
# INCLUDE_RADIUS - build and install radius package
227+
INCLUDE_RADIUS = y

rules/radius.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# libpam-radius-auth packages
22

3+
ifeq ($(INCLUDE_RADIUS), y)
34
PAM_RADIUS_VERSION = 1.4.1-1
45

56
export PAM_RADIUS_VERSION
@@ -21,4 +22,4 @@ $(LIBNSS_RADIUS)_SRC_PATH = $(SRC_PATH)/radius/nss
2122
SONIC_MAKE_DEBS += $(LIBNSS_RADIUS)
2223

2324
SONIC_STRETCH_DEBS += $(LIBNSS_RADIUS)
24-
25+
endif

slave.mk

+2
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ $(info "INCLUDE_P4RT" : "$(INCLUDE_P4RT)")
323323
$(info "INCLUDE_KUBERNETES" : "$(INCLUDE_KUBERNETES)")
324324
$(info "INCLUDE_MACSEC" : "$(INCLUDE_MACSEC)")
325325
$(info "INCLUDE_MUX" : "$(INCLUDE_MUX)")
326+
$(info "INCLUDE_RADIUS" : "$(INCLUDE_RADIUS)")
326327
$(info "TELEMETRY_WRITABLE" : "$(TELEMETRY_WRITABLE)")
327328
$(info "ENABLE_AUTO_TECH_SUPPORT" : "$(ENABLE_AUTO_TECH_SUPPORT)")
328329
$(info "PDDF_SUPPORT" : "$(PDDF_SUPPORT)")
@@ -1029,6 +1030,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
10291030
export include_nat="$(INCLUDE_NAT)"
10301031
export include_p4rt="$(INCLUDE_P4RT)"
10311032
export include_sflow="$(INCLUDE_SFLOW)"
1033+
export include_radius="$(INCLUDE_RADIUS)"
10321034
export enable_auto_tech_support="$(ENABLE_AUTO_TECH_SUPPORT)"
10331035
export include_macsec="$(INCLUDE_MACSEC)"
10341036
export include_mgmt_framework="$(INCLUDE_MGMT_FRAMEWORK)"

0 commit comments

Comments
 (0)