mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 05:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #585 from crawford/ec2

Browse Source 
grub: rename oem_id variable
This commit is contained in:
Alex Crawford 2016-09-14 16:33:50 -07:00 committed by GitHub
commit e89fa7f0fc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_library/grub.cfg
View File

@ -72,8 +72,9 @@ if [ -n "$first_boot" ]; then
set first_boot="coreos.first_boot=1 coreos.randomize_disk_guid=00000000-0000-0000-0000-000000000001" set first_boot="coreos.first_boot=1 coreos.randomize_disk_guid=00000000-0000-0000-0000-000000000001"
fi fi
set oem=""
if [ -n "$oem_id" ]; then if [ -n "$oem_id" ]; then
set oem_id="coreos.oem.id=$oem_id" set oem="coreos.oem.id=$oem_id"
fi fi
# If no specific console has been set by the OEM then select based on # If no specific console has been set by the OEM then select based on
@ -105,7 +106,7 @@ if [ "$grub_platform" = efi ]; then
fi fi
# Assemble the options applicable to all the kernels below # Assemble the options applicable to all the kernels below
set linux_cmdline="rootflags=rw mount.usrflags=ro consoleblank=0 $linux_root $linux_console $first_boot $oem_id $linux_append" set linux_cmdline="rootflags=rw mount.usrflags=ro consoleblank=0 $linux_root $linux_console $first_boot $oem $linux_append"
# Re-implement grub_abort() since no command exposes it. # Re-implement grub_abort() since no command exposes it.
function abort { function abort {