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

Side by Side Diff: bin/cros_make_image_bootable

Issue 3069031: build_image,cros_make_image_bootable: fix missing arm argument (Closed) Base URL: http://src.chromium.org/git/crosutils.git
Patch Set: Created 10 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | build_image » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # 2 #
3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 # 6 #
7 # Script which ensures that a given image has an up-to-date 7 # Script which ensures that a given image has an up-to-date
8 # kernel partition, rootfs integrity hashes, and legacy bootloader configs. 8 # kernel partition, rootfs integrity hashes, and legacy bootloader configs.
9 9
10 # Load common constants. This should be the first executable line. 10 # Load common constants. This should be the first executable line.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 "Default all bootloaders to use kernel-based root fs integrity checking." 73 "Default all bootloaders to use kernel-based root fs integrity checking."
74 DEFINE_integer verity_error_behavior 2 \ 74 DEFINE_integer verity_error_behavior 2 \
75 "Kernel verified boot error behavior (0: I/O errors, 1: reboot, 2: nothing)" 75 "Kernel verified boot error behavior (0: I/O errors, 1: reboot, 2: nothing)"
76 DEFINE_integer verity_depth 1 \ 76 DEFINE_integer verity_depth 1 \
77 "Kernel verified boot hash tree depth" 77 "Kernel verified boot hash tree depth"
78 DEFINE_integer verity_max_ios 1024 \ 78 DEFINE_integer verity_max_ios 1024 \
79 "Number of outstanding I/O operations dm-verity caps at." 79 "Number of outstanding I/O operations dm-verity caps at."
80 DEFINE_string verity_algorithm "sha1" \ 80 DEFINE_string verity_algorithm "sha1" \
81 "Cryptographic hash algorithm used for kernel vboot." 81 "Cryptographic hash algorithm used for kernel vboot."
82 82
83 DEFINE_string arm_extra_bootargs "" \
84 "Additional command line options to pass to the ARM kernel."
85
83 DEFINE_string keys_dir "/usr/share/vboot/devkeys" \ 86 DEFINE_string keys_dir "/usr/share/vboot/devkeys" \
84 "Directory containing the signing keys." 87 "Directory containing the signing keys."
85 88
86 DEFINE_string rootfs_mountpoint "/tmp/rootfs" \ 89 DEFINE_string rootfs_mountpoint "/tmp/rootfs" \
87 "Path where the rootfs can be safely mounted" 90 "Path where the rootfs can be safely mounted"
88 DEFINE_string statefulfs_mountpoint "/tmp/statefulfs" \ 91 DEFINE_string statefulfs_mountpoint "/tmp/statefulfs" \
89 "Path where the statefulfs can be safely mounted" 92 "Path where the statefulfs can be safely mounted"
90 DEFINE_string espfs_mountpoint "/tmp/espfs" \ 93 DEFINE_string espfs_mountpoint "/tmp/espfs" \
91 "Path where the espfs can be safely mounted" 94 "Path where the espfs can be safely mounted"
92 95
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 mkdir -p ${FLAGS_statefulfs_mountpoint} 247 mkdir -p ${FLAGS_statefulfs_mountpoint}
245 mkdir -p ${FLAGS_espfs_mountpoint} 248 mkdir -p ${FLAGS_espfs_mountpoint}
246 249
247 make_image_bootable ${IMAGE} 250 make_image_bootable ${IMAGE}
248 251
249 if [ ${FLAGS_cleanup_dirs} -eq ${FLAGS_TRUE} ]; then 252 if [ ${FLAGS_cleanup_dirs} -eq ${FLAGS_TRUE} ]; then
250 rmdir ${FLAGS_rootfs_mountpoint} 253 rmdir ${FLAGS_rootfs_mountpoint}
251 rmdir ${FLAGS_statefulfs_mountpoint} 254 rmdir ${FLAGS_statefulfs_mountpoint}
252 rmdir ${FLAGS_espfs_mountpoint} 255 rmdir ${FLAGS_espfs_mountpoint}
253 fi 256 fi
OLDNEW
« no previous file with comments | « no previous file | build_image » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698