grub: supply disk guid to randomize in coreos.randomize_disk_guid

This commit is contained in:
Vito Caputo 2015-11-06 14:31:41 -08:00
parent 822edbd080
commit f67fa9ce6c

View File

@ -15,7 +15,6 @@ set timeout=1
set linux_root="root=LABEL=ROOT" set linux_root="root=LABEL=ROOT"
set linux_console="" set linux_console=""
set first_boot="" set first_boot=""
set randomize_disk_guid=""
set oem_id="" set oem_id=""
# Anything else the OEM adds should use this variable. # Anything else the OEM adds should use this variable.
@ -43,9 +42,8 @@ fi
search --no-floppy --set first_boot \ search --no-floppy --set first_boot \
--disk-uuid 00000000-0000-0000-0000-000000000001 --disk-uuid 00000000-0000-0000-0000-000000000001
if [ -n "$first_boot" ]; then if [ -n "$first_boot" ]; then
set first_boot="coreos.first_boot=1" # Note we explicitly request the disk-guid randomization, first_boot only triggers ignition.
# Explicitly request the disk-guid randomization set first_boot="coreos.first_boot=1 coreos.randomize_disk_guid=00000000-0000-0000-0000-000000000001"
set randomize_disk_guid="coreos.randomize_disk_guid=1"
fi fi
if [ -n "$oem_id" ]; then if [ -n "$oem_id" ]; then
@ -79,7 +77,7 @@ else
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 $linux_root $linux_console $first_boot $randomize_disk_guid $oem_id $linux_append" set linux_cmdline="rootflags=rw mount.usrflags=ro $linux_root $linux_console $first_boot $oem_id $linux_append"
menuentry "CoreOS default" --id=coreos { menuentry "CoreOS default" --id=coreos {
gptprio.next -d usr -u usr_uuid gptprio.next -d usr -u usr_uuid