mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-24 23:21:17 +02:00
make_developer_script_runner.sh: fix using full-sized kernels
The developer script runner did not pad for the trailing GPT header and using a full-sized kernel image extracted from a build image resulted in failure. This change accomodates for that and warns when an error occurs. TEST=used a dd'd over kernel image and it worked BUG=chromium-os:7451 Change-Id: I8efd7fbb92fe4d5a3c715580f8c21e52c21957c9 Review URL: http://codereview.chromium.org/4418001 (cherry picked from commit 5f928bef4eb551b94fcc45821eee71aa206cef86) Review URL: http://codereview.chromium.org/4417002
This commit is contained in:
parent
40508146b3
commit
cef56b7dea
@ -65,7 +65,7 @@ if [ -b "$FLAGS_image" ]; then
|
||||
else
|
||||
max_kern_size=32768
|
||||
dd if=/dev/zero of="${FLAGS_image}" bs=512 count=0 \
|
||||
seek=$((1 + max_kern_size + header_offset + stateful_sectors))
|
||||
seek=$((1 + max_kern_size + (2 * header_offset) + stateful_sectors))
|
||||
sudo=""
|
||||
fi
|
||||
|
||||
@ -99,7 +99,7 @@ kernel_sectors=$((kernel_bytes / 512))
|
||||
kernel_sectors=$(roundup $kernel_sectors)
|
||||
|
||||
$sudo $GPT create $FLAGS_image
|
||||
trap "rm $FLAGS_image" ERR
|
||||
trap "rm $FLAGS_image; echo 'An error occurred! Rerun with -v for details.'" ERR
|
||||
|
||||
offset=$header_offset
|
||||
$sudo $GPT add -b $offset -s $stateful_sectors \
|
||||
@ -119,4 +119,4 @@ $sudo $GPT boot -p -b "$PMBRCODE" -i 1 $FLAGS_image 1>&2
|
||||
|
||||
$sudo $GPT show $FLAGS_image
|
||||
|
||||
echo "Done."
|
||||
echo "Emitted $FLAGS_image successfully!"
|
||||
|
Loading…
x
Reference in New Issue
Block a user