diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-07-26 12:26:15 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-08-03 12:22:32 -0700 |
| commit | 8dde1491e59a750a71c08c3d98f7f4f659b68a05 (patch) | |
| tree | c0f9640516c594408da121067f9220c7f79ad41a | |
| parent | 2934475dbc6267915ecddd7bb53c922da928a749 (diff) | |
| download | vboot-8dde1491e59a750a71c08c3d98f7f4f659b68a05.tar.gz | |
Fix make_dev_ssd.sh --remove_rootfs_verification
It was checking for /dev/dm-0, which isn't the case anymore. It now
always attempts to remove rootfs verification from the command line;
this is harmless (no-op) if it's already removed.
BUG=chromium-os:31558
TEST=manual
/usr/share/vboot/bin/make_dev_ssd.sh --remove_rootfs_verification
reboot
touch /opt/google/chrome/chrome
Change-Id: I62dc138e8d1d09bdcb16be3faab74d32c5f7675a
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/28506
Reviewed-by: David James <davidjames@chromium.org>
| -rwxr-xr-x | scripts/image_signing/make_dev_ssd.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh index 5dc88857..8f360715 100755 --- a/scripts/image_signing/make_dev_ssd.sh +++ b/scripts/image_signing/make_dev_ssd.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -68,11 +68,6 @@ remove_rootfs_verification() { s| ro | rw |' } -# Checks if rootfs verification is enabled from kernel boot parameter -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" @@ -198,8 +193,6 @@ resign_ssd_kernel() { if [ ${FLAGS_remove_rootfs_verification} = $FLAGS_FALSE ]; then debug_msg "Bypassing rootfs verification check" - elif ! is_rootfs_verification_enabled "$kernel_config"; then - echo "INFO: $name: rootfs verification was not enabled." else debug_msg "Changing boot parameter to remove rootfs verification" kernel_config="$(remove_rootfs_verification "$kernel_config")" |