mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 06:21:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #308 from marineam/hack

Browse Source 
onmetal: Replace boot_kernel's args
This commit is contained in:
Michael Marineau 2014-07-24 12:01:35 -07:00
commit 9b18163577
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build_library/vm_image_util.sh
View File

@ -162,6 +162,7 @@ IMG_rackspace_vhd_OEM_PACKAGE=oem-rackspace
IMG_rackspace_onmetal_DISK_FORMAT=qcow2 IMG_rackspace_onmetal_DISK_FORMAT=qcow2
IMG_rackspace_onmetal_DISK_LAYOUT=onmetal IMG_rackspace_onmetal_DISK_LAYOUT=onmetal
IMG_rackspace_onmetal_OEM_PACKAGE=oem-rackspace-onmetal IMG_rackspace_onmetal_OEM_PACKAGE=oem-rackspace-onmetal
IMG_rackspace_onmetal_FS_HOOK=onmetal
########################################################### ###########################################################
@ -270,18 +271,14 @@ setup_disk_image() {
sudo mv "${SYSLINUX_DIR}/default.cfg.A" "${SYSLINUX_DIR}/default.cfg" sudo mv "${SYSLINUX_DIR}/default.cfg.A" "${SYSLINUX_DIR}/default.cfg"
fi fi
# The only filesystem after this point that may be modified is OEM # The only filesystems after this point that may be modified are OEM
# and on rare cases ESP.
# Note: it would be more logical for disk_util to mount things read-only # Note: it would be more logical for disk_util to mount things read-only
# to begin with but I'm having trouble making that work reliably. # to begin with but I'm having trouble making that work reliably.
# When mounting w/ ro the automatically allocated loop device will # When mounting w/ ro the automatically allocated loop device will
# also be configured as read-only. blockdev --setrw will change that # also be configured as read-only. blockdev --setrw will change that
# but io will start throwing errors so that clearly isn't sufficient. # but io will start throwing errors so that clearly isn't sufficient.
local mnt sudo mount -o remount,ro "${VM_TMP_ROOT}"
for mnt in $(findmnt -nrR -o target -T "${VM_TMP_ROOT}"); do
if [[ "${mnt}" != */usr/share/oem ]]; then
sudo mount -o remount,ro "${mnt}"
fi
done
VM_GROUP=$(grep --no-messages --no-filename ^GROUP= \ VM_GROUP=$(grep --no-messages --no-filename ^GROUP= \
"${VM_TMP_ROOT}/usr/share/coreos/update.conf" \ "${VM_TMP_ROOT}/usr/share/coreos/update.conf" \
@ -324,6 +321,13 @@ _run_box_fs_hook() {
cp -R "${VM_TMP_ROOT}/usr/share/oem/box/." "${VM_TMP_DIR}/box" cp -R "${VM_TMP_ROOT}/usr/share/oem/box/." "${VM_TMP_DIR}/box"
} }
_run_onmetal_fs_hook() {
# HACKITY HACK until OEMs can customize bootloader configs
local arg='8250.nr_uarts=5 console=ttyS4,115200n8 modprobe.blacklist=mei_me'
sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/boot_kernel.cfg" \
-e 's/console=[^ ]*//g' -e "s/\\(append.*$\\)/\\1 ${arg}/"
}
# Write the vm disk image to the target directory in the proper format # Write the vm disk image to the target directory in the proper format
write_vm_disk() { write_vm_disk() {
if [[ $(_get_vm_opt PARTITIONED_IMG) -eq 1 ]]; then if [[ $(_get_vm_opt PARTITIONED_IMG) -eq 1 ]]; then