diff --git a/script/setup_env.sh b/script/setup_env.sh index 5a3bced5b3343f532cfa9467203d2df2697cfdd3..322ba1567a3ac481f7971220f88854a26158c071 100644 --- a/script/setup_env.sh +++ b/script/setup_env.sh @@ -29,7 +29,7 @@ export RELEASE_ARCH_DIR="openEuler_${ARCH}" export CONTAINER_NAME=$(echo ${RELEASE_VERSION_DIR} | tr A-Z a-z) export VM_IMAGE_NAME="${RELEASE_VERSION_DIR}-${ARCH}.qcow2" export RASPI_IMAGE_NAME="${RELEASE_VERSION_DIR}-raspi-${ARCH}.img" -export MICROVM_IMAGE_NAME="${RELEASE_VERSION_DIR}-microvm-${ARCH}.img" +export MICROVM_IMAGE_NAME="${RELEASE_VERSION_DIR}-stratovirt-${ARCH}.img" export MICROVM_KERNEL_NAME="vmlinux.bin" export PRODUCTS=${OS_NAME} diff --git a/script/step/make_microvm_image.sh b/script/step/make_microvm_image.sh index d423ea8334e52aecfeb572900fbf28b769a57d81..0632c81bd4b4400cffdf18491ca923a19b3b7fcb 100644 --- a/script/step/make_microvm_image.sh +++ b/script/step/make_microvm_image.sh @@ -75,7 +75,7 @@ make_micro_rootfs(){ pushd ${rootfs_dir} rm -rf ./var/cache/ ./var/lib ./var/log ./var/tmp touch etc/resolv.conf - sed -i 's|root:x|root:|' etc/passwd + sed -i 's|root:\*|root:$6$o4rTi3d/.hh6JUYC$ClnCxd2mAQHlt0UloC4ystQg0CiuSVyhXz0sP1mDCNCgWV0rBwegwJ/bCWfjN4WxbahDa7F9U3c6/vFaNgsvX/|' etc/shadow popd LOG "make rootfs for micro_vm end." @@ -193,7 +193,7 @@ function make_microvm_image_inchroot() fi mkdir -p "${img_dir}" - RELEASE_DIR="${release_dir}/microvm_img/${arch}" + RELEASE_DIR="${release_dir}/stratovirt_img/${arch}" SSH_CMD="mkdir -p ${RELEASE_DIR}" sshcmd "${SSH_CMD}"