Skip to content

Commit b2fca1b

Browse files
authored
bug fix: fix syncd.init undefined variables when stopping daemons (sonic-net#46)
1 parent f2e19a8 commit b2fca1b

1 file changed

Lines changed: 15 additions & 12 deletions

File tree

debian/syncd.init

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,39 @@ DAEMON_SYNCD=/usr/bin/syncd
1616
DAEMON_DSSERVE=/usr/local/bin/dsserve
1717
DAEMON_DSSERVE_ARGS="-d $DAEMON_SYNCD --diag"
1818

19+
if [ -x $DAEMON_DSSERVE ]; then
20+
DAEMON=$DAEMON_DSSERVE
21+
DAEMON_ARGS=$DAEMON_DSSERVE_ARGS
22+
else
23+
DAEMON=$DAEMON_SYNCD
24+
fi
25+
1926
start_bcm()
2027
{
2128
[ -e /dev/linux-bcm-knet ] || mknod /dev/linux-bcm-knet c 122 0
2229
[ -e /dev/linux-user-bde ] || mknod /dev/linux-user-bde c 126 0
2330
[ -e /dev/linux-kernel-bde ] || mknod /dev/linux-kernel-bde c 127 0
31+
}
2432

25-
if [ -x $DAEMON_DSSERVE ]; then
26-
DAEMON=$DAEMON_DSSERVE
27-
DAEMON_ARGS=$DAEMON_DSSERVE_ARGS
28-
else
29-
DAEMON=$DAEMON_SYNCD
30-
fi
33+
start_mlnx()
34+
{
35+
mkdir -p /dev/sxdevs
36+
[ -e /dev/sxdevs/sxcdev ] || mknod /dev/sxdevs/sxcdev c 231 193
3137
}
3238

3339
case "$1" in
3440
start)
35-
. /etc/machine.conf
41+
[ -r /etc/machine.conf ] && . /etc/machine.conf
3642

3743
if [ "$onie_platform" == "x86_64-dell_s6000_s1220-r0" ]; then
3844
start_bcm
3945

4046
elif [ "$onie_platform" == "x86_64-dell_s6100_c2538-r0" ]; then
4147
start_bcm
42-
4348
DAEMON_ARGS+=" -p /etc/syncd.d/dell_s6100.profile -N"
44-
elif [ "$onie_platform" == "x86_64-mlnx_x86-r5.0.1400" ]; then
45-
mkdir -p /dev/sxdevs
46-
[ -e /dev/sxdevs/sxcdev ] || mknod /dev/sxdevs/sxcdev c 231 193
4749

48-
DAEMON=$DAEMON_SYNCD
50+
elif [ "$onie_platform" == "x86_64-mlnx_x86-r5.0.1400" ]; then
51+
start_mlnx
4952
DAEMON_ARGS="-p /etc/syncd.d/mlnx_2700.profile -N"
5053
fi
5154

0 commit comments

Comments
 (0)