Skip to content

[action] [PR:12609] [armhf][sonic-installer] Fix an issue of the sonic-installer install after the cleanup #12977

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
mssonicbld merged 1 commit into from
Dec 7, 2022
Merged

[action] [PR:12609] [armhf][sonic-installer] Fix an issue of the sonic-installer install after the cleanup #12977

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
41 changes: 36 additions & 5 deletions platform/marvell-armhf/platform.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,42 @@ prepare_boot_menu() {
fdt_name_old=""
sonic_version_2="None"
else
image_dir_old=$(fw_printenv -n image_dir || true)
image_name_old=$(fw_printenv -n image_name || true)
initrd_name_old=$(fw_printenv -n initrd_name || true)
fdt_name_old=$(fw_printenv -n fdt_name || true)
sonic_version_2=$(fw_printenv -n sonic_version_1 || true)
eval running_version="$(cat /proc/cmdline | sed -n 's/^.*loop=\/*image-\(\S\+\)\/.*$/\1/p')"
current_boot_next=$(fw_printenv -n boot_next || true)
running_sonic_image=1
if [ "$current_boot_next" = "run sonic_image_1" ]; then
# boot_next=run sonic_image_1
sonic_version_2=$(fw_printenv -n sonic_version_2 || true)
if test "${sonic_version_2#*$running_version}" != "$sonic_version_2"
then
running_sonic_image=2
else
running_sonic_image=1
fi
else
# boot_next=run sonic_image_2
sonic_version_1=$(fw_printenv -n sonic_version_1 || true)
if test "${sonic_version_1#*$running_version}" != "$sonic_version_1"
then
running_sonic_image=1
else
running_sonic_image=2
fi
fi

if [ $running_sonic_image -eq 1 ]; then
image_dir_old=$(fw_printenv -n image_dir || true)
image_name_old=$(fw_printenv -n image_name || true)
initrd_name_old=$(fw_printenv -n initrd_name || true)
fdt_name_old=$(fw_printenv -n fdt_name || true)
sonic_version_2=$(fw_printenv -n sonic_version_1 || true)
else
image_dir_old=$(fw_printenv -n image_dir_old || true)
image_name_old=$(fw_printenv -n image_name_old || true)
initrd_name_old=$(fw_printenv -n initrd_name_old || true)
fdt_name_old=$(fw_printenv -n fdt_name_old || true)
sonic_version_2=$(fw_printenv -n sonic_version_2 || true)
fi
fi

# Set boot variables
Expand Down