commit da5a79017d04670ae0d32aef10d9dd3a18d7a62a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 23 22:06:09 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 23 22:06:09 2023 +0000
tree 5a0ba9afb66b69c48deffa635d07b9883efbd022
parent c0ec063b397e3c4de7ccad664b633ddc5b5fa311
parent 0a5dd2c97d66eb6f9696cb69505b568004615c99

Merge "build_rootfs.sh: Add support for ampere/gigabyte"

net/test/TEST_MAPPING

diff --git a/net/test/TEST_MAPPING b/net/test/TEST_MAPPING
index 8d31caa..bc27d17 100644
--- a/net/test/TEST_MAPPING
+++ b/net/test/TEST_MAPPING
@@ -3,5 +3,10 @@
     {
       "name": "vts_kernel_net_tests"
     }
+  ],
+  "kernel-presubmit": [
+    {
+      "name": "vts_kernel_net_tests"
+    }
   ]
 }

net/test/build_rootfs.sh

diff --git a/net/test/build_rootfs.sh b/net/test/build_rootfs.sh
index 3a88cad..ef5f491 100755
--- a/net/test/build_rootfs.sh
+++ b/net/test/build_rootfs.sh
@@ -374,8 +374,14 @@
     sudo e2fsck -p -f "${disk}" || true
 else
     rootfs_partition_start=$(partx -g -o START -s -n "${rootfs_partition}" "${disk}" | xargs)
+    rootfs_partition_end=$(partx -g -o END -s -n "${rootfs_partition}" "${disk}" | xargs)
+    rootfs_partition_num_sectors=$((${rootfs_partition_end} - ${rootfs_partition_start} + 1))
     rootfs_partition_offset=$((${rootfs_partition_start} * 512))
-    e2fsck -p -f "${disk}"?offset=${rootfs_partition_offset} || true
+    rootfs_partition_tempfile2=$(mktemp)
+    dd if="${disk}" of="${rootfs_partition_tempfile2}" bs=512 skip=${rootfs_partition_start} count=${rootfs_partition_num_sectors}
+    e2fsck -p -f "${rootfs_partition_tempfile2}" || true
+    dd if="${rootfs_partition_tempfile2}" of="${disk}" bs=512 seek=${rootfs_partition_start} count=${rootfs_partition_num_sectors} conv=fsync,notrunc
+    rm -f "${rootfs_partition_tempfile2}"
     e2fsck -fy "${disk}"?offset=${rootfs_partition_offset} || true
 fi
 if [[ -n "${system_partition}" ]]; then
@@ -500,8 +506,14 @@
     sudo e2fsck -p -f "${disk}" || true
 else
     rootfs_partition_start=$(partx -g -o START -s -n "${rootfs_partition}" "${disk}" | xargs)
+    rootfs_partition_end=$(partx -g -o END -s -n "${rootfs_partition}" "${disk}" | xargs)
+    rootfs_partition_num_sectors=$((${rootfs_partition_end} - ${rootfs_partition_start} + 1))
     rootfs_partition_offset=$((${rootfs_partition_start} * 512))
-    e2fsck -p -f "${disk}"?offset=${rootfs_partition_offset} || true
+    rootfs_partition_tempfile2=$(mktemp)
+    dd if="${disk}" of="${rootfs_partition_tempfile2}" bs=512 skip=${rootfs_partition_start} count=${rootfs_partition_num_sectors}
+    e2fsck -p -f "${rootfs_partition_tempfile2}" || true
+    dd if="${rootfs_partition_tempfile2}" of="${disk}" bs=512 seek=${rootfs_partition_start} count=${rootfs_partition_num_sectors} conv=fsync,notrunc
+    rm -f "${rootfs_partition_tempfile2}"
     e2fsck -fy "${disk}"?offset=${rootfs_partition_offset} || true
 fi
 if [[ -n "${system_partition}" ]]; then