Skip to content

Update fast-reboot script to boot next selected image #112

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
lguohan merged 3 commits into from
Oct 7, 2017
Merged

Update fast-reboot script to boot next selected image #112

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5eb485b
Update fast-reboot script to boot next selected image
andriymoroz-mlnx Sep 28, 2017
a3733dd
Updated BOOT_OPTIONS
andriymoroz-mlnx Oct 5, 2017
7fd6516
Renamed intermediate BOOT_OPTIONS to KERNEL_OPTIONS
andriymoroz-mlnx Oct 6, 2017
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
18 changes: 6 additions & 12 deletions scripts/fast-reboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,11 @@ then
fi

# Kernel and initrd image
KERNEL_IMAGE="/vmlinuz"
INITRD="/initrd.img"
BOOT_OPTIONS=$(cat /proc/cmdline)

case "$BOOT_OPTIONS" in
*fast-reboot*)
# it's already there
;;
*)
BOOT_OPTIONS="$BOOT_OPTIONS fast-reboot"
;;
esac
NEXT_SONIC_IMAGE=$(sonic_installer list | grep "Next: " | cut -d ' ' -f 2)
KERNEL_OPTIONS=$(cat /host/grub/grub.cfg | sed "/$NEXT_SONIC_IMAGE'/,/}/"'!'"g" | grep linux)
KERNEL_IMAGE="/host$(echo $KERNEL_OPTIONS | cut -d ' ' -f 2)"
BOOT_OPTIONS="$(echo $KERNEL_OPTIONS | sed -e 's/\s*linux\s*/BOOT_IMAGE=/') fast-reboot"
INITRD=$(echo $KERNEL_IMAGE | sed 's/vmlinuz/initrd.img/g')

sonic_asic_type=$(sonic-cfggen -y /etc/sonic/sonic_version.yml -v asic_type)

Expand Down Expand Up @@ -67,4 +60,5 @@ sleep 1
sync

# Reboot
echo "Rebooting to $NEXT_SONIC_IMAGE..."
reboot