Skip to content

[Bug][Build] Fix the variable patterns not replaced issue #11572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 2, 2022
Merged

[Bug][Build] Fix the variable patterns not replaced issue #11572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81d90f0
[Bug][Build] Fix the variable patterns not replaced issue
xumia Jul 28, 2022
06e0759
Set the patterns in install.sh
xumia Jul 29, 2022
34873dd
Fix demo_part_size issue
xumia Jul 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions installer/default_platform.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ create_partition()
# determine ONIE partition type
onie_partition_type=$(${onie_bin} onie-sysinfo -t)
# demo partition size in MB
demo_part_size="%%ONIE_IMAGE_PART_SIZE%%"
if [ "$firmware" = "uefi" ] ; then
create_demo_uefi_partition $blk_dev
elif [ "$onie_partition_type" = "gpt" ] ; then
Expand Down Expand Up @@ -471,7 +470,6 @@ EOF
fi

# Add extra linux command line
extra_cmdline_linux=%%EXTRA_CMDLINE_LINUX%%
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EXTRA_CMDLINE_LINUX

The 3 lines were added in one commit, it makes sense to remove all 3 lines together.

echo "EXTRA_CMDLINE_LINUX=$extra_cmdline_linux"
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX $extra_cmdline_linux"

Expand Down
3 changes: 3 additions & 0 deletions installer/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,9 @@ if [ "$install_env" = "onie" ]; then
fi
fi

demo_part_size="%%ONIE_IMAGE_PART_SIZE%%"
echo "ONIE_IMAGE_PART_SIZE=$demo_part_size"

extra_cmdline_linux=%%EXTRA_CMDLINE_LINUX%%
echo "EXTRA_CMDLINE_LINUX=$extra_cmdline_linux"

Expand Down