[warm reboot] unload kexec before rebooting and when error exiting from warm boot (#383)

yxieca · lguohan · commit 1879fd02ea74 · 2018-11-19T19:11:17.000-08:00
Signed-off-by: Ying Xie &lt;ying.xie@microsoft.com&gt;
diff --git a/scripts/fast-reboot b/scripts/fast-reboot
@@ -9,6 +9,7 @@ WARM_DIR=/host/warmboot
 function clear_warm_boot()
 {
     config warm_restart disable || /bin/true
+    /sbin/kexec -u || /bin/true
 
     TIMESTAMP=`date +%Y%m%d-%H%M%S`
     if [[ -f ${WARM_DIR}/config_db.json ]]; then
diff --git a/scripts/reboot b/scripts/reboot
@@ -23,6 +23,7 @@ function clear_warm_boot()
     if [[ -f ${WARM_DIR}/config_db.json ]]; then
         mv -f ${WARM_DIR}/config_db.json ${WARM_DIR}/config_db-${TIMESTAMP}.json
     fi
+    /sbin/kexec -u || /bin/true
 }
 
 # Exit if not superuser

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ WARM_DIR=/host/warmboot`
`9`	`9`	`function clear_warm_boot()`
`10`	`10`	`{`
`11`	`11`	`config warm_restart disable \|\| /bin/true`
	`12`	`+ /sbin/kexec -u \|\| /bin/true`
`12`	`13`
`13`	`14`	TIMESTAMP=`date +%Y%m%d-%H%M%S`
`14`	`15`	`if [[ -f ${WARM_DIR}/config_db.json ]]; then`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ function clear_warm_boot()`
`23`	`23`	`if [[ -f ${WARM_DIR}/config_db.json ]]; then`
`24`	`24`	`mv -f ${WARM_DIR}/config_db.json ${WARM_DIR}/config_db-${TIMESTAMP}.json`
`25`	`25`	`fi`
	`26`	`+ /sbin/kexec -u \|\| /bin/true`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`# Exit if not superuser`