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

Add SWI_DEFAULT support in boot0 (#2056)

Browse Source 
Currently setting the next boot image is the same as setting a default
image.
With this change SWI_DEFAULT= will be considered the default image and
SWI= the next image.
When executing the boot0 SWI= will be overriden by SWI_DEFAULT= if it
exists and create in with the value of SWI= otherwise.
This commit is contained in:
Samuel Angebault 2018-09-20 00:19:40 -07:00 committed by lguohan
parent 8a5e6ac47d
commit 7ece396592
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
files/Aboot/boot0.j2
View File

@ -48,7 +48,6 @@ kernel_params="kernel-params"
aboot_machine="arista_unknown" aboot_machine="arista_unknown"
# extract mount point from the swi path, e.g., /mnt/flash/sonic.swi --> /mnt/flash # extract mount point from the swi path, e.g., /mnt/flash/sonic.swi --> /mnt/flash
if [ -z "$target_path" ]; then if [ -z "$target_path" ]; then
if [ -z "$swipath" ]; then if [ -z "$swipath" ]; then
@ -61,6 +60,7 @@ image_path="$target_path/$image_name"
cmdline_base="$target_path/kernel-params-base" cmdline_base="$target_path/kernel-params-base"
cmdline_image="$image_path/kernel-cmdline" cmdline_image="$image_path/kernel-cmdline"
boot_config="$target_path/boot-config"
bootconfigvars="KERNEL INITRD CONSOLESPEED PASSWORD NETDEV NETAUTO NETIP NETMASK NETGW NETDOMAIN NETDNS NETHW memtest" bootconfigvars="KERNEL INITRD CONSOLESPEED PASSWORD NETDEV NETAUTO NETIP NETMASK NETGW NETDOMAIN NETDNS NETHW memtest"
flash_re=" /mnt/flash| /host" flash_re=" /mnt/flash| /host"
@ -88,6 +88,33 @@ clean_flash() {
done done
} }
update_boot_config() {
local key="$1"
local value="$2"
if grep "$key" "$boot_config" 2>&1 > /dev/null; then
sed -i "s#^$key=.*\$#$key=$value#" "$boot_config"
else
echo "$key=$value" >> "$boot_config"
fi
}
get_boot_config() {
local key="$1"
sed -n "s#^$key=##p" "$boot_config" || :
}
update_next_boot() {
local default="$(get_boot_config SWI_DEFAULT)"
if [ -z "$default" ]; then
echo "warning: no variable SWI_DEFAULT available"
else
update_boot_config SWI "$default"
fi
}
extract_image() { extract_image() {
mkdir -p "$image_path" mkdir -p "$image_path"
@ -114,7 +141,9 @@ extract_image() {
fi fi
## use new reduced-size boot swi ## use new reduced-size boot swi
echo "SWI=flash:$image_name/{{ ABOOT_BOOT_IMAGE }}" > "$target_path/boot-config" local swi_boot_path="flash:$image_name/{{ ABOOT_BOOT_IMAGE }}"
update_boot_config SWI "$swi_boot_path"
update_boot_config SWI_DEFAULT "$swi_boot_path"
## Remove installer swi as it has lots of redundunt contents ## Remove installer swi as it has lots of redundunt contents
rm -f "$swipath" rm -f "$swipath"
@ -320,6 +349,7 @@ fi
# chainloading using kexec # chainloading using kexec
if $do_kexec; then if $do_kexec; then
update_next_boot
run_kexec run_kexec
fi fi