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

Merge pull request #7 from Azure/master

Browse Source 
fix fast reboot compatibility (#3083)
This commit is contained in:
srideepDell 2019-06-27 14:05:34 -07:00 committed by GitHub
commit 1260d4615c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 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

@ -33,15 +33,15 @@ function updateHostName()
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'
;; ;;
*) *)