Skip to content

Commit 0c4c69a

Browse files
CamelronRedent0r
authored andcommitted
runtime: Set disable_image_nvdimm=true to disable pmem
Re-add DEFDISABLEIMAGENVDIMM=true to package_build.sh to fix a regression causing us to use pmem. Signed-off-by: Cameron Baird <[email protected]>
1 parent 601d543 commit 0c4c69a

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

tools/osbuilder/node-builder/azure-linux/package_build.sh

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,19 @@ common_file="common.sh"
2020
source "${common_file}"
2121

2222
# these options ensure we produce the proper CLH config file
23-
runtime_make_flags="SKIP_GO_VERSION_CHECK=1 QEMUCMD= FCCMD= ACRNCMD= STRATOVIRTCMD= DEFAULT_HYPERVISOR=cloud-hypervisor
24-
DEFMEMSZ=0 DEFSTATICSANDBOXWORKLOADMEM=512 DEFVCPUS=0 DEFSTATICSANDBOXWORKLOADVCPUS=1 DEFVIRTIOFSDAEMON=${VIRTIOFSD_BINARY_LOCATION} PREFIX=${INSTALL_PATH_PREFIX}"
23+
runtime_make_flags="SKIP_GO_VERSION_CHECK=1 \
24+
QEMUCMD= \
25+
FCCMD= \
26+
ACRNCMD= \
27+
STRATOVIRTCMD= \
28+
DEFAULT_HYPERVISOR=cloud-hypervisor \
29+
DEFMEMSZ=0 \
30+
DEFSTATICSANDBOXWORKLOADMEM=512 \
31+
DEFVCPUS=0 \
32+
DEFSTATICSANDBOXWORKLOADVCPUS=1 \
33+
DEFDISABLEIMAGENVDIMM=true \
34+
DEFVIRTIOFSDAEMON=${VIRTIOFSD_BINARY_LOCATION} \
35+
PREFIX=${INSTALL_PATH_PREFIX}"
2536

2637
# - for vanilla Kata we use the kernel binary. For ConfPods we use IGVM, so no need to provide kernel path.
2738
# - for vanilla Kata we explicitly set DEFSTATICRESOURCEMGMT_CLH. For ConfPods,

0 commit comments

Comments
 (0)