build_image, build_kernel_image, update_bootloaders: fix up rootfs_verification

update_bootloaders.sh

 #!/bin/bash
 
 # Copyright (c) 2010 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.
 
 # Helper script that generates the legacy/efi bootloader partitions.
 # It does not populate the templates, but can update a loop device.
 
 . "$(dirname "$0")/common.sh"
@@ skipping 54 matching lines @@
 
     # Rewrite grub table
     grub_dm_table_a=${dm_table//${old_root}/\$linuxpartA}
     grub_dm_table_b=${dm_table//${old_root}/\$linuxpartB}
     sed -e "s|DMTABLEA|${grub_dm_table_a}|g" \
         -e "s|DMTABLEB|${grub_dm_table_b}|g" \
         "${template_dir}"/efi/boot/grub.cfg |
         sudo dd of="${esp_fs_dir}"/efi/boot/grub.cfg
 
     # Rewrite syslinux DM_TABLE
-    usb_target="${FLAGS_usb_disk//\//\\\/}"
-    syslinux_dm_table_usb=${dm_table//\/dev\/${old_root}/${usb_target}}
+    syslinux_dm_table_usb=${dm_table//\/dev\/${old_root}/${FLAGS_usb_disk}}
     sed -e "s|DMTABLEA|${syslinux_dm_table_usb}|g" \
         "${template_dir}"/syslinux/usb.A.cfg |
         sudo dd of="${esp_fs_dir}"/syslinux/usb.A.cfg
 
     syslinux_dm_table_a=${dm_table//\/dev\/${old_root}/HDROOTA}
     sed -e "s|DMTABLEA|${syslinux_dm_table_a}|g" \
         "${template_dir}"/syslinux/root.A.cfg |
         sudo dd of="${esp_fs_dir}"/syslinux/root.A.cfg
 
     syslinux_dm_table_b=${dm_table//\/dev\/${old_root}/HDROOTB}
-    sed -e "s|DMTABLEA|${syslinux_dm_table_a}|g" \
+    sed -e "s|DMTABLEB|${syslinux_dm_table_b}|g" \
         "${template_dir}"/syslinux/root.B.cfg |
         sudo dd of="${esp_fs_dir}"/syslinux/root.B.cfg
 
     # Copy the vmlinuz's into place for syslinux
     sudo cp -f "${template_dir}"/vmlinuz "${esp_fs_dir}"/syslinux/vmlinuz.A
     sudo cp -f "${template_dir}"/vmlinuz "${esp_fs_dir}"/syslinux/vmlinuz.B
 
     # The only work left for the installer is to pick the correct defaults
     # and replace HDROOTA and HDROOTB with the correct /dev/sd%D%P.
   }
@@ skipping 114 matching lines @@
     ${FLAGS_kernel_partition_offset} \
     ${FLAGS_kernel_partition_sectors} \
     ${device} \
     "'dm=\"${dm_table}\"'")
   sudo dd bs=1 count=`stat --printf="%s" ${MBR_SCRIPT_UIMG}` \
      if="$MBR_SCRIPT_UIMG" of=${FLAGS_to}
   info "Emitted new ARM MBR to ${FLAGS_to}"
 fi
 
 set +e