@@ -199,14 +199,14 @@ create_demo_gpt_partition()
199
199
fi
200
200
sgdisk --new=${demo_part} ::+${demo_part_size} MB \
201
201
--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 \
203
203
|| {
204
204
echo " Warning: The first trial of creating partition failed, trying the largest aligned available block of sectors on the disk"
205
205
begin=$( sgdisk -F $blk_dev )
206
206
end=$( sgdisk -E $blk_dev )
207
207
sgdisk --new=${demo_part} :$begin :$end \
208
208
--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
210
210
} || {
211
211
echo " Error: Unable to create partition $demo_part on $blk_dev "
212
212
exit 1
@@ -385,7 +385,7 @@ eval $create_demo_partition $blk_dev
385
385
demo_dev=$( echo $blk_dev | sed -e ' s/\(mmcblk[0-9]\)/\1p/' ) $demo_part
386
386
387
387
# Make filesystem
388
- mkfs.ext4 -L $demo_volume_revision_label $demo_dev
388
+ mkfs.ext4 -L $demo_volume_label $demo_dev
389
389
390
390
# Mount demo filesystem
391
391
demo_mnt=$( ${onie_bin} mktemp -d) || {
488
488
demo_grub_entry=" $demo_volume_revision_label "
489
489
cat << EOF >> $grub_cfg
490
490
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
492
492
echo 'Loading $demo_volume_revision_label $demo_type kernel ...'
493
493
insmod gzio
494
494
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
0 commit comments