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

[NVMe] Add NVMe SSD disc type support to installer.sh script (#6142)

Browse Source 
In order to install a SONiC image on top of a NVMe SSD disc properly with ONIE we must configure it properly on the installer.sh script.

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
This commit is contained in:
shlomibitton 2020-12-10 05:03:27 +02:00 committed by GitHub
parent d4d90a8963
commit 6762f526d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/initramfs-tools/modules
View File

@ -4,3 +4,4 @@ vfat
nls_ascii nls_ascii
nls_cp437 nls_cp437
nls_utf8 nls_utf8
nvme

8
installer/x86_64/install.sh
View File

@ -106,6 +106,11 @@ fi
if [ "$install_env" != "build" ]; then if [ "$install_env" != "build" ]; then
onie_dev=$(blkid | grep ONIE-BOOT | head -n 1 | awk '{print $1}' | sed -e 's/:.*$//') onie_dev=$(blkid | grep ONIE-BOOT | head -n 1 | awk '{print $1}' | sed -e 's/:.*$//')
blk_dev=$(echo $onie_dev | sed -e 's/[1-9][0-9]*$//' | sed -e 's/\([0-9]\)\(p\)/\1/') blk_dev=$(echo $onie_dev | sed -e 's/[1-9][0-9]*$//' | sed -e 's/\([0-9]\)\(p\)/\1/')
# check if we have an nvme device
blk_suffix=
echo $blk_dev | grep -q nvme0 && blk_suffix="p"
# Note: ONIE has no mount setting for / with device node, so below will be empty string # Note: ONIE has no mount setting for / with device node, so below will be empty string
cur_part=$(cat /proc/mounts | awk "{ if(\$2==\"/\") print \$1 }" | grep $blk_dev || true) cur_part=$(cat /proc/mounts | awk "{ if(\$2==\"/\") print \$1 }" | grep $blk_dev || true)
@ -225,7 +230,7 @@ create_demo_gpt_partition()
echo "Partition #$demo_part is available" echo "Partition #$demo_part is available"
# Create new partition # Create new partition
echo "Creating new $demo_volume_label partition ${blk_dev}$demo_part ..." echo "Creating new $demo_volume_label partition ${blk_dev}${blk_suffix}$demo_part ..."
if [ "$demo_type" = "DIAG" ] ; then if [ "$demo_type" = "DIAG" ] ; then
# set the GPT 'system partition' attribute bit for the DIAG # set the GPT 'system partition' attribute bit for the DIAG
@ -424,6 +429,7 @@ image_dir="image-$image_version"
if [ "$install_env" = "onie" ]; then if [ "$install_env" = "onie" ]; then
eval $create_demo_partition $blk_dev eval $create_demo_partition $blk_dev
demo_dev=$(echo $blk_dev | sed -e 's/\(mmcblk[0-9]\)/\1p/')$demo_part demo_dev=$(echo $blk_dev | sed -e 's/\(mmcblk[0-9]\)/\1p/')$demo_part
echo $blk_dev | grep -q nvme0 && demo_dev=$(echo $blk_dev | sed -e 's/\(nvme[0-9]n[0-9]\)/\1p/')$demo_part
# Make filesystem # Make filesystem
mkfs.ext4 -L $demo_volume_label $demo_dev mkfs.ext4 -L $demo_volume_label $demo_dev