Skip to content

Commit 9a4b0ad

Browse files
authored
[build]: use short disk label (#516)
1 parent 68fcc36 commit 9a4b0ad

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

installer/x86_64/install.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,14 @@ create_demo_gpt_partition()
199199
fi
200200
sgdisk --new=${demo_part}::+${demo_part_size}MB \
201201
--attributes=${demo_part}:=:$attr_bitmask \
202-
--change-name=${demo_part}:$demo_volume_revision_label $blk_dev \
202+
--change-name=${demo_part}:$demo_volume_label $blk_dev \
203203
|| {
204204
echo "Warning: The first trial of creating partition failed, trying the largest aligned available block of sectors on the disk"
205205
begin=$(sgdisk -F $blk_dev)
206206
end=$(sgdisk -E $blk_dev)
207207
sgdisk --new=${demo_part}:$begin:$end \
208208
--attributes=${demo_part}:=:$attr_bitmask \
209-
--change-name=${demo_part}:$demo_volume_revision_label $blk_dev
209+
--change-name=${demo_part}:$demo_volume_label $blk_dev
210210
} || {
211211
echo "Error: Unable to create partition $demo_part on $blk_dev"
212212
exit 1
@@ -385,7 +385,7 @@ eval $create_demo_partition $blk_dev
385385
demo_dev=$(echo $blk_dev | sed -e 's/\(mmcblk[0-9]\)/\1p/')$demo_part
386386
387387
# Make filesystem
388-
mkfs.ext4 -L $demo_volume_revision_label $demo_dev
388+
mkfs.ext4 -L $demo_volume_label $demo_dev
389389
390390
# Mount demo filesystem
391391
demo_mnt=$(${onie_bin} mktemp -d) || {
@@ -488,7 +488,7 @@ fi
488488
demo_grub_entry="$demo_volume_revision_label"
489489
cat <<EOF >> $grub_cfg
490490
menuentry '$demo_grub_entry' {
491-
search --no-floppy --label --set=root $demo_volume_revision_label
491+
search --no-floppy --label --set=root $demo_volume_label
492492
echo 'Loading $demo_volume_revision_label $demo_type kernel ...'
493493
insmod gzio
494494
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi

0 commit comments

Comments
 (0)