mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-25 07:31:01 +02:00
update_kernel.sh: modify to work inside chroot
BUG=n0ne TEST=Successfully updated a kernel. Change-Id: If168c47cca4b5b794d95c9b839b17bff3f96ed9c Review URL: http://codereview.chromium.org/6249004
This commit is contained in:
parent
aef91ad564
commit
2f3b5fc537
@ -12,11 +12,22 @@
|
|||||||
. "$(dirname $0)/common.sh"
|
. "$(dirname $0)/common.sh"
|
||||||
. "$(dirname $0)/remote_access.sh"
|
. "$(dirname $0)/remote_access.sh"
|
||||||
|
|
||||||
|
# Script must be run inside the chroot.
|
||||||
|
restart_in_chroot_if_needed $*
|
||||||
|
|
||||||
DEFINE_string board "" "Override board reported by target"
|
DEFINE_string board "" "Override board reported by target"
|
||||||
DEFINE_string partition "" "Override kernel partition reported by target"
|
DEFINE_string partition "" "Override kernel partition reported by target"
|
||||||
DEFINE_boolean modules false "Update modules on target"
|
DEFINE_boolean modules false "Update modules on target"
|
||||||
DEFINE_boolean firmware false "Update firmware on target"
|
DEFINE_boolean firmware false "Update firmware on target"
|
||||||
|
|
||||||
|
# Parse command line.
|
||||||
|
FLAGS "$@" || exit 1
|
||||||
|
eval set -- "${FLAGS_ARGV}"
|
||||||
|
|
||||||
|
# Only now can we die on error. shflags functions leak non-zero error codes,
|
||||||
|
# so will die prematurely if 'set -e' is specified before now.
|
||||||
|
set -e
|
||||||
|
|
||||||
function cleanup {
|
function cleanup {
|
||||||
cleanup_remote_access
|
cleanup_remote_access
|
||||||
rm -rf "${TMP}"
|
rm -rf "${TMP}"
|
||||||
@ -39,15 +50,6 @@ function learn_partition() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function main() {
|
function main() {
|
||||||
assert_outside_chroot
|
|
||||||
|
|
||||||
cd $(dirname "$0")
|
|
||||||
|
|
||||||
FLAGS "$@" || exit 1
|
|
||||||
eval set -- "${FLAGS_ARGV}"
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
|
|
||||||
TMP=$(mktemp -d /tmp/image_to_live.XXXX)
|
TMP=$(mktemp -d /tmp/image_to_live.XXXX)
|
||||||
@ -60,15 +62,13 @@ function main() {
|
|||||||
|
|
||||||
old_kernel="${REMOTE_OUT}"
|
old_kernel="${REMOTE_OUT}"
|
||||||
|
|
||||||
cmd="vbutil_kernel --pack new_kern.bin \
|
vbutil_kernel --pack new_kern.bin \
|
||||||
--keyblock /usr/share/vboot/devkeys/kernel.keyblock \
|
--keyblock /usr/share/vboot/devkeys/kernel.keyblock \
|
||||||
--signprivate /usr/share/vboot/devkeys/kernel_data_key.vbprivk \
|
--signprivate /usr/share/vboot/devkeys/kernel_data_key.vbprivk \
|
||||||
--version 1 \
|
--version 1 \
|
||||||
--config ../build/images/${FLAGS_board}/latest/config.txt \
|
--config ../build/images/"${FLAGS_board}"/latest/config.txt \
|
||||||
--bootloader /lib64/bootstub/bootstub.efi \
|
--bootloader /lib64/bootstub/bootstub.efi \
|
||||||
--vmlinuz /build/${FLAGS_board}/boot/vmlinuz"
|
--vmlinuz /build/"${FLAGS_board}"/boot/vmlinuz
|
||||||
|
|
||||||
./enter_chroot.sh -- ${cmd}
|
|
||||||
|
|
||||||
learn_partition
|
learn_partition
|
||||||
|
|
||||||
@ -78,8 +78,7 @@ function main() {
|
|||||||
|
|
||||||
if [[ ${FLAGS_modules} -eq ${FLAGS_TRUE} ]]; then
|
if [[ ${FLAGS_modules} -eq ${FLAGS_TRUE} ]]; then
|
||||||
echo "copying modules"
|
echo "copying modules"
|
||||||
cmd="tar -C /build/${FLAGS_board}/lib/modules -cjf new_modules.tar ."
|
tar -C /build/"${FLAGS_board}"/lib/modules -cjf new_modules.tar .
|
||||||
./enter_chroot.sh -- ${cmd}
|
|
||||||
|
|
||||||
remote_cp_to new_modules.tar /tmp/
|
remote_cp_to new_modules.tar /tmp/
|
||||||
|
|
||||||
@ -89,8 +88,7 @@ function main() {
|
|||||||
|
|
||||||
if [[ ${FLAGS_firmware} -eq ${FLAGS_TRUE} ]]; then
|
if [[ ${FLAGS_firmware} -eq ${FLAGS_TRUE} ]]; then
|
||||||
echo "copying firmware"
|
echo "copying firmware"
|
||||||
cmd="tar -C /build/${FLAGS_board}/lib/firmware -cjf new_firmware.tar ."
|
tar -C /build/"${FLAGS_board}"/lib/firmware -cjf new_firmware.tar .
|
||||||
./enter_chroot.sh -- ${cmd}
|
|
||||||
|
|
||||||
remote_cp_to new_firmware.tar /tmp/
|
remote_cp_to new_firmware.tar /tmp/
|
||||||
|
|
||||||
@ -101,9 +99,7 @@ function main() {
|
|||||||
remote_reboot
|
remote_reboot
|
||||||
|
|
||||||
remote_sh uname -r -v
|
remote_sh uname -r -v
|
||||||
|
|
||||||
info "old kernel: ${old_kernel}"
|
info "old kernel: ${old_kernel}"
|
||||||
|
|
||||||
info "new kernel: ${REMOTE_OUT}"
|
info "new kernel: ${REMOTE_OUT}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user