diff options
| -rw-r--r-- | net/test/TEST_MAPPING | 5 | ||||
| -rwxr-xr-x | net/test/build_rootfs.sh | 16 |
2 files changed, 19 insertions, 2 deletions
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" + } ] } 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 @@ if [[ ${rootfs_partition} = "raw" ]]; then 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 @@ if [[ ${rootfs_partition} = "raw" ]]; then 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 |