From 52251b715f626b87e24cd331d6e102d4ba0ffc65 Mon Sep 17 00:00:00 2001 From: Yunhao Wan Date: Fri, 3 Sep 2021 22:07:31 +0000 Subject: [PATCH] add VHD size constant Signed-off-by: Yunhao Wan --- cmd/dmverity-vhd/main.go | 2 +- ext4/dmverity/dmverity.go | 3 ++- internal/tools/securitypolicy/main.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/dmverity-vhd/main.go b/cmd/dmverity-vhd/main.go index 952865ca63..74cf3f6679 100644 --- a/cmd/dmverity-vhd/main.go +++ b/cmd/dmverity-vhd/main.go @@ -27,7 +27,7 @@ const ( imageFlag = "image" verboseFlag = "verbose" outputDirFlag = "out-dir" - maxVHDSize = 128 * 1024 * 1024 * 1024 + maxVHDSize = dmverity.RecommendedVHDSizeGB ) func init() { diff --git a/ext4/dmverity/dmverity.go b/ext4/dmverity/dmverity.go index 2fe201bebc..8948421172 100644 --- a/ext4/dmverity/dmverity.go +++ b/ext4/dmverity/dmverity.go @@ -16,8 +16,9 @@ import ( const ( blockSize = compactext4.BlockSize + // RecommendedVHDSizeGB is the recommended size in GB for VHDs, which is not a hard limit. + RecommendedVHDSizeGB = 128 * 1024 * 1024 * 1024 ) - var salt = bytes.Repeat([]byte{0}, 32) var ( diff --git a/internal/tools/securitypolicy/main.go b/internal/tools/securitypolicy/main.go index 926a91bc7e..27cef7ff08 100644 --- a/internal/tools/securitypolicy/main.go +++ b/internal/tools/securitypolicy/main.go @@ -150,7 +150,7 @@ func createPolicyFromConfig(config Config) (sp.SecurityPolicy, error) { opts := []tar2ext4.Option{ tar2ext4.ConvertWhiteout, - tar2ext4.MaximumDiskSize(128 * 1024 * 1024 * 1024), + tar2ext4.MaximumDiskSize(dmverity.RecommendedVHDSizeGB), } err = tar2ext4.Convert(r, out, opts...)