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

[build]: use short disk label (#516)

Browse Source
This commit is contained in:
lguohan 2017-04-19 00:55:22 -07:00 committed by GitHub
parent 68fcc36549
commit 9a4b0adcc7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installer/x86_64/install.sh
View File

@ -199,14 +199,14 @@ create_demo_gpt_partition()
fi fi
sgdisk --new=${demo_part}::+${demo_part_size}MB \ sgdisk --new=${demo_part}::+${demo_part_size}MB \
--attributes=${demo_part}:=:$attr_bitmask \ --attributes=${demo_part}:=:$attr_bitmask \
--change-name=${demo_part}:$demo_volume_revision_label $blk_dev \ --change-name=${demo_part}:$demo_volume_label $blk_dev \
|| { || {
echo "Warning: The first trial of creating partition failed, trying the largest aligned available block of sectors on the disk" echo "Warning: The first trial of creating partition failed, trying the largest aligned available block of sectors on the disk"
begin=$(sgdisk -F $blk_dev) begin=$(sgdisk -F $blk_dev)
end=$(sgdisk -E $blk_dev) end=$(sgdisk -E $blk_dev)
sgdisk --new=${demo_part}:$begin:$end \ sgdisk --new=${demo_part}:$begin:$end \
--attributes=${demo_part}:=:$attr_bitmask \ --attributes=${demo_part}:=:$attr_bitmask \
--change-name=${demo_part}:$demo_volume_revision_label $blk_dev --change-name=${demo_part}:$demo_volume_label $blk_dev
} || { } || {
echo "Error: Unable to create partition $demo_part on $blk_dev" echo "Error: Unable to create partition $demo_part on $blk_dev"
exit 1 exit 1
@ -385,7 +385,7 @@ 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
# Make filesystem # Make filesystem
mkfs.ext4 -L $demo_volume_revision_label $demo_dev mkfs.ext4 -L $demo_volume_label $demo_dev
# Mount demo filesystem # Mount demo filesystem
demo_mnt=$(${onie_bin} mktemp -d) || { demo_mnt=$(${onie_bin} mktemp -d) || {
@ -488,7 +488,7 @@ fi
demo_grub_entry="$demo_volume_revision_label" demo_grub_entry="$demo_volume_revision_label"
cat <<EOF >> $grub_cfg cat <<EOF >> $grub_cfg
menuentry '$demo_grub_entry' { menuentry '$demo_grub_entry' {
search --no-floppy --label --set=root $demo_volume_revision_label search --no-floppy --label --set=root $demo_volume_label
echo 'Loading $demo_volume_revision_label $demo_type kernel ...' echo 'Loading $demo_volume_revision_label $demo_type kernel ...'
insmod gzio insmod gzio
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi