Skip to content

Revert "Watchdog enable/disable in DellEMC S6100 " #2817

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
yxieca merged 1 commit into from
Apr 23, 2019
Merged

Revert "Watchdog enable/disable in DellEMC S6100 " #2817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ common/dell_i2c_utils.sh usr/local/bin
common/io_rd_wr.py usr/local/bin
common/platform_reboot usr/share/sonic/device/x86_64-dell_s6100_c2538-r0
s6100/scripts/platform_sensors.py usr/local/bin
s6100/scripts/platform_watchdog_enable.sh usr/local/bin
s6100/scripts/platform_watchdog_disable.sh usr/local/bin
s6100/scripts/sensors usr/bin
s6100/systemd/platform-modules-s6100.service etc/systemd/system
13 changes: 0 additions & 13 deletions platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_disable.sh
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_enable.sh
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,6 @@ if [[ "$1" == "init" ]]; then
modprobe dell_s6100_iom_cpld
modprobe dell_s6100_lpc

# Disable Watchdog Timer
if [[ -e /usr/local/bin/platform_watchdog_disable.sh ]]; then
exec /usr/local/bin/platform_watchdog_disable.sh
fi

cpu_board_mux "new_device"
switch_board_mux "new_device"
sys_eeprom "new_device"
Expand Down