Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1784)

Unified Diff: scripts/image_signing/make_dev_ssd.sh

Issue 6813109: make_dev_ssd.sh: support updating legacy boot partitions (Closed) Base URL: ssh://gitrw.chromium.org:9222/vboot_reference.git@master
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/image_signing/make_dev_ssd.sh
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh
index a9f36a0fc26e0fdd6b00bd4043eb1614a5ccd5e1..17e84977b0adee919b9351156d31ad770091230f 100755
--- a/scripts/image_signing/make_dev_ssd.sh
+++ b/scripts/image_signing/make_dev_ssd.sh
@@ -61,6 +61,22 @@ is_rootfs_verification_enabled() {
echo "$*" | grep -q 'root=/dev/dm-0'
}
+remove_legacy_boot_rootfs_verification() {
+ # See src/scripts/create_legacy_bootloader_templates
+ local image="$1"
+ local mount_point="$(make_temp_dir)"
+ local config_file
+ debug_msg "Removing rootfs verification for legacy boot configuration."
+ mount_image_partition "$image" 12 "$mount_point" || return $FLAGS_FALSE
+ config_file="$mount_point/efi/boot/grub.cfg"
+ [ ! -f "$config_file" ] ||
+ sudo sed -i 's/^ *set default=2 *$/set default=0/g' "$config_file"
+ config_file="$mount_point/syslinux/default.cfg"
+ [ ! -f "$config_file" ] ||
+ sudo sed -i 's/-vusb/-usb/g; s/-vhd/-hd/g' "$config_file"
+ sudo umount "$mount_point"
+}
+
# Wrapped version of dd
mydd() {
# oflag=sync is safer, but since we need bs=512, syncing every block would be
@@ -158,6 +174,7 @@ resign_ssd_kernel() {
kernel_config="$(remove_rootfs_verification "$kernel_config")"
debug_msg "New kernel config: $kernel_config"
echo "$name: Disabled rootfs verification."
+ remove_legacy_boot_rootfs_verification "$ssd_device"
fi
local new_kernel_config_file="$(make_temp_file)"
@@ -287,4 +304,11 @@ main() {
fi
}
+# People using this to process images may forget to add "-i",
+# so adding parameter check is safer.
+if [ "$#" -gt 0 ]; then
+ flags_help
+ err_die "Unknown parameters: $@"
+fi
+
main
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698