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

[fast-reboot] fix fast reboot compatibility (#3083) and advance sai-redis/201811 point (#3089)

Browse Source 
* fix fast reboot compatibility (#3083) and advance sai-redis/201811 point
* Repoint the submodule
This commit is contained in:
Qi Luo 2019-06-26 22:02:21 -07:00 committed by GitHub
parent a6fa4d1fcc
commit 588c687a27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/build_templates/docker_image_ctl.j2
View File

@ -7,15 +7,15 @@ function getMountPoint()
function getBootType() function getBootType()
{ {
local BOOT_TYPE # same code snippet in files/scripts/syncd.sh
case "$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)" in case "$(cat /proc/cmdline)" in
warm*) *SONIC_BOOT_TYPE=warm*)
TYPE='warm' TYPE='warm'
;; ;;
fastfast) *SONIC_BOOT_TYPE=fastfast*)
TYPE='fastfast' TYPE='fastfast'
;; ;;
fast*) *SONIC_BOOT_TYPE=fast*|*fast-reboot*)
TYPE='fast' TYPE='fast'
;; ;;
*) *)

9
files/scripts/syncd.sh
View File

@ -55,14 +55,15 @@ function wait_for_database_service()
function getBootType() function getBootType()
{ {
case "$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)" in # same code snippet in files/build_templates/docker_image_ctl.j2
warm*) case "$(cat /proc/cmdline)" in
*SONIC_BOOT_TYPE=warm*)
TYPE='warm' TYPE='warm'
;; ;;
fastfast) *SONIC_BOOT_TYPE=fastfast*)
TYPE='fastfast' TYPE='fastfast'
;; ;;
fast*) *SONIC_BOOT_TYPE=fast*|*fast-reboot*)
TYPE='fast' TYPE='fast'
;; ;;
*) *)

2
src/sonic-sairedis

@ -1 +1 @@
Subproject commit d027eae034d538febe9fdb62682745a6b39a79ee Subproject commit c350c544f34dbb0706b9102f1f49f1d0af835796