Skip to content
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

Jump to bottom

[installer]: support new onie machine.conf format #1468

Merged
merged 2 commits into from
Mar 18, 2018
Merged

[installer]: support new onie machine.conf format #1468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1367289
[installer]: support new onie machine.conf format
lguohan Mar 7, 2018
c8aa75d
add ^match
lguohan Mar 17, 2018
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
8 changes: 7 additions & 1 deletion installer/x86_64/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,13 @@ unzip -op $ONIE_INSTALLER_PAYLOAD "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPT

if [ "$install_env" = "onie" ]; then
# Store machine description in target file system
cp /etc/machine.conf $demo_mnt
if [ -f /etc/machine-build.conf ]; then
# onie_ variable are generate at runtime.
# they are no longer hardcoded in /etc/machine.conf
set | grep ^onie_ > $demo_mnt/machine.conf
else
cp /etc/machine.conf $demo_mnt
fi

# Store installation log in target file system
rm -f $onie_initrd_tmp/tmp/onie-support*.tar.bz2
Expand Down