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

[grub]: use UUID for root partition (#4443)

Browse Source 
Signed-off-by: Guohan Lu <lguohan@gmail.com>
This commit is contained in:
lguohan 2020-04-18 21:14:05 -07:00 committed by GitHub
parent d8b716681c
commit 5ce330ad3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
installer/x86_64/install.sh
View File

@ -583,19 +583,22 @@ EOF
$onie_root_dir/tools/bin/onie-boot-mode -q -o install $onie_root_dir/tools/bin/onie-boot-mode -q -o install
fi fi
# Add a menu entry for the DEMO OS # Add a menu entry for the SONiC OS
# Note: assume that apparmor is supported in the kernel # Note: assume that apparmor is supported in the kernel
demo_grub_entry="$demo_volume_revision_label" demo_grub_entry="$demo_volume_revision_label"
if [ "$install_env" = "sonic" ]; then if [ "$install_env" = "sonic" ]; then
old_sonic_menuentry=$(cat /host/grub/grub.cfg | sed "/$running_sonic_revision/,/}/!d") old_sonic_menuentry=$(cat /host/grub/grub.cfg | sed "/$running_sonic_revision/,/}/!d")
demo_dev=$(echo $old_sonic_menuentry | sed -e "s/.*root\=\(.*\)rw.*/\1/") grub_cfg_root=$(echo $old_sonic_menuentry | sed -e "s/.*root\=\(.*\)rw.*/\1/")
onie_menuentry=$(cat /host/grub/grub.cfg | sed "/menuentry ONIE/,/}/!d") onie_menuentry=$(cat /host/grub/grub.cfg | sed "/menuentry ONIE/,/}/!d")
fi elif [ "$install_env" = "build" ]; then
if [ "$install_env" = "build" ]; then
grub_cfg_root=%%SONIC_ROOT%% grub_cfg_root=%%SONIC_ROOT%%
else else # install_env = "onie"
grub_cfg_root=$demo_dev uuid=$(blkid "$demo_dev" | sed -ne 's/.* UUID=\"\([^"]*\)\".*/\1/p')
if [ -z "$uuid" ]; then
grub_cfg_root=$demo_dev
else
grub_cfg_root=UUID=$uuid
fi
fi fi
cat <<EOF >> $grub_cfg cat <<EOF >> $grub_cfg