mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-28 22:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

disk_layout: mount ESP to /boot instead of /boot/efi

Browse Source 
We have long since stopped installing anything to the /boot directory of
the root filesystem. Mount the ESP partition to /boot for consistancy
with the discoverable partition spec.
This commit is contained in:
Michael Marineau 2014-08-27 11:51:02 -07:00
parent a1d3a95381
commit 4228c591a8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_library/build_image_util.sh
View File

@ -202,12 +202,12 @@ finish_image() {
${tmp_ignore} "${root_fs_dir}/etc" ${tmp_ignore} "${root_fs_dir}/etc"
# Only configure bootloaders if there is a boot partition # Only configure bootloaders if there is a boot partition
if mountpoint -q "${root_fs_dir}"/boot/efi; then if mountpoint -q "${root_fs_dir}"/boot; then
${BUILD_LIBRARY_DIR}/configure_bootloaders.sh \ ${BUILD_LIBRARY_DIR}/configure_bootloaders.sh \
--arch=${ARCH} \ --arch=${ARCH} \
--disk_layout="${disk_layout}" \ --disk_layout="${disk_layout}" \
--boot_dir="${root_fs_dir}"/usr/boot \ --boot_dir="${root_fs_dir}"/usr/boot \
--esp_dir="${root_fs_dir}"/boot/efi \ --esp_dir="${root_fs_dir}"/boot \
--boot_args="${FLAGS_boot_args}" --boot_args="${FLAGS_boot_args}"
fi fi

2
build_library/disk_layout.json
View File

@ -12,7 +12,7 @@
"type":"efi", "type":"efi",
"blocks":"262144", "blocks":"262144",
"fs_type":"vfat", "fs_type":"vfat",
"mount":"/boot/efi", "mount":"/boot",
"features": ["syslinux"] "features": ["syslinux"]
}, },
"2":{ "2":{

8
build_library/vm_image_util.sh
View File

@ -276,7 +276,7 @@ setup_disk_image() {
"${BUILD_LIBRARY_DIR}/disk_util" --disk_layout="${disk_layout}" \ "${BUILD_LIBRARY_DIR}/disk_util" --disk_layout="${disk_layout}" \
mount "${VM_TMP_IMG}" "${VM_TMP_ROOT}" mount "${VM_TMP_IMG}" "${VM_TMP_ROOT}"
local SYSLINUX_DIR="${VM_TMP_ROOT}/boot/efi/syslinux" local SYSLINUX_DIR="${VM_TMP_ROOT}/boot/syslinux"
if [[ $(_get_vm_opt BOOT_KERNEL) -eq 0 ]]; then if [[ $(_get_vm_opt BOOT_KERNEL) -eq 0 ]]; then
sudo mv "${SYSLINUX_DIR}/default.cfg.A" "${SYSLINUX_DIR}/default.cfg" sudo mv "${SYSLINUX_DIR}/default.cfg.A" "${SYSLINUX_DIR}/default.cfg"
fi fi
@ -336,9 +336,9 @@ _run_onmetal_fs_hook() {
local arg='8250.nr_uarts=5 console=ttyS4,115200n8 modprobe.blacklist=mei_me' local arg='8250.nr_uarts=5 console=ttyS4,115200n8 modprobe.blacklist=mei_me'
local timeout=150 # 15 seconds local timeout=150 # 15 seconds
local totaltimeout=3000 # 5 minutes local totaltimeout=3000 # 5 minutes
sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/boot_kernel.cfg" \ sudo sed -i "${VM_TMP_ROOT}/boot/syslinux/boot_kernel.cfg" \
-e 's/console=[^ ]*//g' -e "s/\\(append.*$\\)/\\1 ${arg}/" -e 's/console=[^ ]*//g' -e "s/\\(append.*$\\)/\\1 ${arg}/"
sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/syslinux.cfg" \ sudo sed -i "${VM_TMP_ROOT}/boot/syslinux/syslinux.cfg" \
-e "s/^TIMEOUT [0-9]*/TIMEOUT ${timeout}/g" \ -e "s/^TIMEOUT [0-9]*/TIMEOUT ${timeout}/g" \
-e "s/^TOTALTIMEOUT [0-9]*/TOTALTIMEOUT ${totaltimeout}/g" -e "s/^TOTALTIMEOUT [0-9]*/TOTALTIMEOUT ${totaltimeout}/g"
} }
@ -346,7 +346,7 @@ _run_onmetal_fs_hook() {
_run_gce_fs_hook() { _run_gce_fs_hook() {
# HACKITY HACK until OEMs can customize bootloader configs # HACKITY HACK until OEMs can customize bootloader configs
local arg='console=ttyS0,115200n8' local arg='console=ttyS0,115200n8'
sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/boot_kernel.cfg" \ sudo sed -i "${VM_TMP_ROOT}/boot/syslinux/boot_kernel.cfg" \
-e 's/console=[^ ]*//g' -e "s/\\(append.*$\\)/\\1 ${arg}/" -e 's/console=[^ ]*//g' -e "s/\\(append.*$\\)/\\1 ${arg}/"
} }